Merge pull request #612 from iShafayet/0.2.0

0.2.0
anvilglobaldynamics · Apr 15, 2019 · 91a0800 · 91a0800
2 parents d8266a0 + 2a2c1cb
commit 91a0800
Show file tree

Hide file tree

Showing 21 changed files with 995 additions and 46 deletions.
diff --git a/client/index.html b/client/index.html
@@ -57,6 +57,7 @@
     } */
 
     body {
+      touch-action: none;
       margin: 0;
       font-family: 'Roboto', 'Noto', sans-serif;
       font-display: block;

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
@@ -143,6 +143,7 @@
     "serviceMembership": "সেবার সদস্যপদ",
     "customers": "গ্রাহক",
     "salesReport": "বিক্রয় রিপোর্টস",
+    "collectionReport": "সংগ্রহ রিপোর্ট",
     "inventoryReport": "পণ্য তালিকা রিপোর্টস",
     "profile": "প্রোফাইল",
     "settings": "সেটিংস",
@@ -628,7 +629,7 @@
     "accessDeniedDescription": "আপনার এই ফীচারটির এক্সেস নাই। "
   },
   "pos": {
-    "posPageTitle": "নতুন বিক্রয়",
+    "posPageTitle": "বিক্রয়কেন্দ্র",
     "newSalesAdded": "নতুন বিক্রয় যুক্ত করা হয়েছে।",
     "noCustomerSelected": "কোন গ্রাহক নির্বাচন করা হয়নি",
     "removeCustomer": "সরান",
@@ -675,7 +676,8 @@
     "showHideButton": "দেখুন",
     "createdOfflineSaleDatetime": "তৈরি",
     "assignedEmployee": "দায়িত্ব দেন",
-    "assignEmployee": "দায়িত্ব দেয়া"
+    "assignEmployee": "দায়িত্ব দেয়া",
+    "noDiscountApplicable": "প্রযোজ্য নয়"
   },
   "salesReport": {
     "salesReportTitle": "বিক্রয় বিবরণ",
@@ -688,15 +690,16 @@
     "showSalesProductDetails": "বিক্রয় এবং পণ্যের বিবরণ দেখান হোক",
     "author": "রচক",
     "particulars": "বিবরণ",
-    "billedAmount": "বিল পরিমান",
+    "billedAmount": "বিল",
     "sales": "বিক্রয়",
     "soldTo": "গ্রাহক",
     "products": "পণ্য",
     "services": "সেবা",
     "total": "মোট",
-    "discountedAmount": "ছাড়ের পরিমান",
+    "discountedAmount": "ছাড়",
     "vat": "ভ্যাট",
     "serviceCharge": "সেবা মূল্য",
+    "dueAmount": "বাকি",
     "previousBalance": "পূর্বের হিসাব"
   },
   "inventoriesReport": {
@@ -928,5 +931,22 @@
     "deleteQuestion": "প্রিসেট মুছে ফেলুন?",
     "deleteQuestionMessage": "আপনি কি ডিসকাউন্ট প্রিসেটটি মুছে ফেলতে চান?",
     "discountPresetNameInput": "ডিসকাউন্ট প্রিসেটের নাম "
+  },
+  "collectionReport": {
+    "collectionReportTitle": "সংগ্রহ বিবরণ",
+    "collectedAmount": "সংগৃহীত",
+    "sales": "বিক্রয়",
+    "collectedBy": "সংগ্রহকারী",
+    "paymentMethod": "মূল্যপরিশোধ পদ্ধতি",
+    "allPaymentMethods": "সকল",
+    "author": "রচক",
+    "particulars": "বিবরণ",
+    "noCustomerSelected": "কোন গ্রাহক নির্বাচন করা হয়নি",
+    "removeCustomer": "গ্রাহক সরান",
+    "changeCustomer": "গ্রাহক পরিবর্তন করুন",
+    "noOutletSelected": "কোন দোকান নির্বাচন করা হয়নি",
+    "removeOutlet": "দোকান সরান",
+    "changeOutlet": "দোকান পরিবর্তন করুন",
+    "total": "মোট"
   }
 }
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
@@ -143,6 +143,7 @@
     "serviceMembership": "Service Memberships",
     "customers": "Customers",
     "salesReport": "Sales Report",
+    "collectionReport": "Collection Report",
     "inventoryReport": "Inventories Report",
     "profile": "Profile",
     "settings": "Settings",
@@ -626,7 +627,7 @@
     "accessDeniedDescription": "You do not have access to this feature."
   },
   "pos": {
-    "posPageTitle": "New Sales",
+    "posPageTitle": "POS",
     "newSalesAdded": "New Sales has been added.",
     "noCustomerSelected": "No customer selected (Anonymous Sale)",
     "removeCustomer": "Remove",
@@ -673,7 +674,8 @@
     "submitOfflineSales": "Sync",
     "createdOfflineSaleDatetime": "Created",
     "assignedEmployee": "assigned",
-    "assignEmployee": "assign"
+    "assignEmployee": "assign",
+    "noDiscountApplicable": "Not Applicable"
   },
   "salesReport": {
     "salesReportTitle": "Sales Report",
@@ -687,15 +689,16 @@
     "showSalesProductDetails": "Show Sales and Product Details",
     "author": "Author",
     "particulars": "Particulars",
-    "billedAmount": "Billed Amount",
+    "billedAmount": "Billed",
     "sales": "Sales",
     "soldTo": "Sold To",
-    "products": "product(s)",
-    "services": "service(s)",
+    "products": "Product(s)",
+    "services": "Service(s)",
     "total": "Total",
-    "discountedAmount": "Discounted Amount",
+    "discountedAmount": "Discount",
     "vat": "VAT",
     "serviceCharge": "Service Charge",
+    "dueAmount": "Due",
     "previousBalance": "Previous Balance"
   },
   "inventoriesReport": {
@@ -927,5 +930,22 @@
     "deleteQuestion": "Delete discount preset?",
     "deleteQuestionMessage": "Are you sure you want to delete this discount preset",
     "discountPresetNameInput": "Discount Preset Name"
+  },
+  "collectionReport": {
+    "collectionReportTitle": "Collection Report",
+    "collectedAmount": "Collected",
+    "sales": "Sales",
+    "collectedBy": "Collected By",
+    "paymentMethod": "Payment Method",
+    "allPaymentMethods": "All",
+    "author": "Author",
+    "particulars": "Particulars",
+    "noCustomerSelected": "No customer selected (Anonymous Sale)",
+    "removeCustomer": "Remove Customer",
+    "changeCustomer": "Change Customer",
+    "noOutletSelected": "No outlet selected (Anonymous Sale)",
+    "removeOutlet": "Remove Outlet",
+    "changeOutlet": "Change Outlet",
+    "total": "Total"
   }
 }
diff --git a/client/src/page-pos.html b/client/src/page-pos.html
@@ -321,7 +321,7 @@
 
                   <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.discount]]" class="mr-4">
                     <paper-listbox slot="dropdown-content" selected="{{selectedDiscountPreset}}" attr-for-selected="name">
-                      <paper-item name="--no-discount">No Discount</paper-item>
+                      <paper-item name="--no-discount">[[verses.pos.noDiscountApplicable]]</paper-item>
                       <template is="dom-repeat" items="[[discountPresetList]]" as="discountPreset">
                         <paper-item name="[[discountPreset.id]]">
                           <div class="name">[[discountPreset.name]]</div>