Merge pull request #992 from AbleKSaju/fix-update-icons

fix: update icons in pos
frappe · Oct 23, 2024 · 0d967c1 · 0d967c1
2 parents f1eb12e + 91b0d46
commit 0d967c1
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 42 deletions.
diff --git a/models/helpers.ts b/models/helpers.ts
@@ -818,8 +818,6 @@ export async function getPricingRulesOfCoupons(
     })) as CouponCode[];
   }
 
-  console.log('pricingRuleDocNames', pricingRuleDocNames);
-
   const filteredPricingRuleNames = appliedCoupons.filter(
     (val) => val.pricingRule === pricingRuleDocNames![0]
   );
@@ -842,7 +840,6 @@ export async function getPricingRulesOfCoupons(
     }
   )) as PricingRule[];
 
-  console.log('pricingRuleDocsForItem', pricingRuleDocsForItem);
   return pricingRuleDocsForItem;
 }
 

diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
@@ -122,10 +122,10 @@
 
           <div class="flex fixed bottom-0 p-1 mb-7 gap-x-3">
             <div class="relative group">
-              <div class="bg-gray-100 p-1 rounded-md" @click="toggleView">
+              <div class="bg-gray-100 p-1.5 rounded-md" @click="toggleView">
                 <FeatherIcon
                   :name="tableView ? 'grid' : 'list'"
-                  class="w-6 h-6 text-black"
+                  class="w-5 h-5 text-black"
                 />
               </div>
               <span
@@ -137,7 +137,7 @@
                   -translate-x-1/2
                   mb-2
                   bg-gray-100
-                  dark:bg-gray-850 dark:text-white
+                  dark:bg-gray-800 dark:text-white
                   text-black text-xs
                   rounded-md
                   p-2
@@ -155,28 +155,18 @@
 
             <div class="relative group">
               <div
-                class="p-1 rounded-md bg-gray-100"
-                :class="{
-                  hidden: !fyo.singles.AccountingSettings?.enableLoyaltyProgram,
-                  'bg-gray-100': loyaltyPoints,
-                  'dark:bg-gray-600 cursor-not-allowed':
-                    !loyaltyPoints || !sinvDoc.party || !sinvDoc.items?.length,
-                }"
-                @click="
-                  loyaltyPoints && sinvDoc.party && sinvDoc.items?.length
-                    ? toggleModal('LoyaltyProgram', true)
-                    : null
-                "
+                class="px-1.5 py-1 rounded-md bg-gray-100"
+                @click="routeToSinvList"
               >
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
-                  height="24px"
+                  height="24"
                   viewBox="0 -960 960 960"
-                  width="26px"
+                  width="21"
                   fill="#000"
                 >
                   <path
-                    d="M100-180v-600h760v600H100Zm50.26-50.26h659.48v-499.48H150.26v499.48Zm0 0v-499.48 499.48Zm181.64-56.77h50.25v-42.56h48.67q14.37 0 23.6-10.38 9.22-10.38 9.22-24.25v-106.93q0-14.71-9.22-24.88-9.23-10.17-23.6-10.17H298.77v-73.95h164.87v-50.26h-81.49v-42.56H331.9v42.56h-48.41q-14.63 0-24.8 10.38-10.18 10.38-10.18 25v106.27q0 14.62 10.18 23.71 10.17 9.1 24.8 9.1h129.9v76.1H248.51v50.26h83.39v42.56Zm312.97-27.94L705.9-376H583.85l61.02 61.03ZM583.85-574H705.9l-61.03-61.03L583.85-574Z"
+                    d="M240-100q-41.92 0-70.96-29.04Q140-158.08 140-199.82V-300h120v-552.31l55.39 47.7 56.15-47.7 56.15 47.7 56.16-47.7 56.15 47.7 56.15-47.7 56.16 47.7 56.15-47.7 56.15 47.7 55.39-47.7V-200q0 41.92-29.04 70.96Q761.92-100 720-100H240Zm480-60q17 0 28.5-11.5T760-200v-560H320v460h360v100q0 17 11.5 28.5T720-160ZM367.69-610v-60h226.92v60H367.69Zm0 120v-60h226.92v60H367.69Zm310-114.62q-14.69 0-25.04-10.34-10.34-10.35-10.34-25.04t10.34-25.04q10.35-10.34 25.04-10.34t25.04 10.34q10.35 10.35 10.35 25.04t-10.35 25.04q-10.35 10.34-25.04 10.34Zm0 120q-14.69 0-25.04-10.34-10.34-10.35-10.34-25.04t10.34-25.04q10.35-10.34 25.04-10.34t25.04 10.34q10.35 10.35 10.35 25.04t-10.35 25.04q-10.35 10.34-25.04 10.34ZM240-160h380v-80H200v40q0 17 11.5 28.5T240-160Zm-40 0v-80 80Z"
                   />
                 </svg>
               </div>
@@ -188,36 +178,47 @@
                   left-1/2
                   transform
                   -translate-x-1/2
-                  mb-2
-                  bg-gray-100
-                  dark:bg-gray-850 dark:text-white
-                  text-black text-xs
                   rounded-md
+                  opacity-0
+                  bg-gray-100
+                  dark:bg-gray-800 dark:text-white
+                  text-black text-xs text-center
+                  mb-2
                   p-2
                   w-28
-                  text-center
-                  opacity-0
                   group-hover:opacity-100
                   transition-opacity
                   duration-300
                 "
               >
-                Loyalty Program
+                Sales Invoice List
               </span>
             </div>
 
             <div class="relative group">
-              <div class="p-1 rounded-md bg-gray-100" @click="routeToSinvList">
+              <div
+                class="p-1 rounded-md bg-gray-100"
+                :class="{
+                  hidden: !fyo.singles.AccountingSettings?.enableLoyaltyProgram,
+                  'bg-gray-100': loyaltyPoints,
+                  'dark:bg-gray-600 cursor-not-allowed':
+                    !loyaltyPoints || !sinvDoc.party || !sinvDoc.items?.length,
+                }"
+                @click="
+                  loyaltyPoints && sinvDoc.party && sinvDoc.items?.length
+                    ? toggleModal('LoyaltyProgram', true)
+                    : null
+                "
+              >
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
-                  height="24"
+                  height="23px"
                   viewBox="0 -960 960 960"
-                  width="24"
-                  fill="currentColor"
-                  class="text-gray-700 dark:text-gray-300"
+                  width="25px"
+                  fill="#000"
                 >
                   <path
-                    d="M240-100q-41.92 0-70.96-29.04Q140-158.08 140-199.82V-300h120v-552.31l55.39 47.7 56.15-47.7 56.15 47.7 56.16-47.7 56.15 47.7 56.15-47.7 56.16 47.7 56.15-47.7 56.15 47.7 55.39-47.7V-200q0 41.92-29.04 70.96Q761.92-100 720-100H240Zm480-60q17 0 28.5-11.5T760-200v-560H320v460h360v100q0 17 11.5 28.5T720-160ZM367.69-610v-60h226.92v60H367.69Zm0 120v-60h226.92v60H367.69Zm310-114.62q-14.69 0-25.04-10.34-10.34-10.35-10.34-25.04t10.34-25.04q10.35-10.34 25.04-10.34t25.04 10.34q10.35 10.35 10.35 25.04t-10.35 25.04q-10.35 10.34-25.04 10.34Zm0 120q-14.69 0-25.04-10.34-10.34-10.35-10.34-25.04t10.34-25.04q10.35-10.34 25.04-10.34t25.04 10.34q10.35 10.35 10.35 25.04t-10.35 25.04q-10.35 10.34-25.04 10.34ZM240-160h380v-80H200v40q0 17 11.5 28.5T240-160Zm-40 0v-80 80Z"
+                    d="M100-180v-600h760v600H100Zm50.26-50.26h659.48v-499.48H150.26v499.48Zm0 0v-499.48 499.48Zm181.64-56.77h50.25v-42.56h48.67q14.37 0 23.6-10.38 9.22-10.38 9.22-24.25v-106.93q0-14.71-9.22-24.88-9.23-10.17-23.6-10.17H298.77v-73.95h164.87v-50.26h-81.49v-42.56H331.9v42.56h-48.41q-14.63 0-24.8 10.38-10.18 10.38-10.18 25v106.27q0 14.62 10.18 23.71 10.17 9.1 24.8 9.1h129.9v76.1H248.51v50.26h83.39v42.56Zm312.97-27.94L705.9-376H583.85l61.02 61.03ZM583.85-574H705.9l-61.03-61.03L583.85-574Z"
                   />
                 </svg>
               </div>
@@ -229,20 +230,21 @@
                   left-1/2
                   transform
                   -translate-x-1/2
-                  rounded-md
-                  opacity-0
-                  bg-gray-100
-                  dark:bg-gray-850 dark:text-white
-                  text-black text-xs text-center
                   mb-2
+                  bg-gray-100
+                  dark:bg-gray-800 dark:text-white
+                  text-black text-xs
+                  rounded-md
                   p-2
                   w-28
+                  text-center
+                  opacity-0
                   group-hover:opacity-100
                   transition-opacity
                   duration-300
                 "
               >
-                Sales Invoice List
+                Loyalty Program
               </span>
             </div>
 
@@ -268,7 +270,7 @@
                   xmlns="http://www.w3.org/2000/svg"
                   xmlns:xlink="http://www.w3.org/1999/xlink"
                   stroke="#000000"
-                  stroke-width="9.312000000000001"
+                  stroke-width="3.312000000000001"
                   transform="matrix(1, 0, 0, 1, 0, 0)rotate(0)"
                 >
                   <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
@@ -321,7 +323,7 @@
                   -translate-x-1/2
                   mb-2
                   bg-gray-100
-                  dark:bg-gray-850 dark:text-white
+                  dark:bg-gray-800 dark:text-white
                   text-black text-xs
                   rounded-md
                   p-2