Merge pull request #93 from yrestom/develop

Version 3.1.1
ucraft-com · Dec 19, 2021 · 47731ad · 47731ad
2 parents fb978dc + ebfd14e
commit 47731ad
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 38 deletions.
diff --git a/posawesome/__init__.py b/posawesome/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 
 def console(*data):

diff --git a/posawesome/fixtures/custom_field.json b/posawesome/fixtures/custom_field.json
@@ -2123,19 +2123,19 @@
   "allow_in_quick_entry": 0,
   "allow_on_submit": 0,
   "bold": 0,
-  "collapsible": 1,
+  "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": null,
+  "default": "0",
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_pos_awesome_advance_settings",
-  "fieldtype": "Section Break",
+  "fieldname": "posa_allow_print_last_invoice",
+  "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
   "hide_days": 0,
@@ -2146,12 +2146,12 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_allow_print_last_invoice",
-  "label": "POS Awesome Advance Settings",
+  "insert_after": "posa_allow_customer_purchase_order",
+  "label": "Allow Print Last Invoice",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2020-10-11 15:13:10.899536",
-  "name": "POS Profile-posa_pos_awesome_advance_settings",
+  "modified": "2021-12-16 18:00:40.631156",
+  "name": "POS Profile-posa_allow_print_last_invoice",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -2287,13 +2287,13 @@
   "columns": 0,
   "default": null,
   "depends_on": null,
-  "description": "Send invoice to submit after printing",
+  "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_allow_submissions_in_background_job",
+  "fieldname": "posa_display_additional_notes",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -2305,12 +2305,65 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_pos_awesome_advance_settings",
-  "label": "Allow Submissions in background job",
+  "insert_after": "posa_allow_print_last_invoice",
+  "label": "Display Additional Notes",
   "length": 0,
-  "mandatory_depends_on": "0",
-  "modified": "2020-10-09 16:05:54.332880",
-  "name": "POS Profile-posa_allow_submissions_in_background_job",
+  "mandatory_depends_on": null,
+  "modified": "2021-12-19 16:54:32.986600",
+  "name": "POS Profile-posa_display_additional_notes",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 0,
+  "unique": 0,
+  "width": null
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 1,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "POS Profile",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "posa_pos_awesome_advance_settings",
+  "fieldtype": "Section Break",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "posa_display_additional_notes",
+  "label": "POS Awesome Advance Settings",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2020-10-11 15:13:10.899536",
+  "name": "POS Profile-posa_pos_awesome_advance_settings",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -2391,15 +2444,15 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": "1",
+  "default": null,
   "depends_on": null,
-  "description": null,
+  "description": "Send invoice to submit after printing",
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_local_storage",
+  "fieldname": "posa_allow_submissions_in_background_job",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -2411,12 +2464,12 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_allow_submissions_in_background_job",
-  "label": "Use Browser Local Storage",
+  "insert_after": "posa_pos_awesome_advance_settings",
+  "label": "Allow Submissions in background job",
   "length": 0,
-  "mandatory_depends_on": null,
-  "modified": "2020-11-13 22:14:13.683091",
-  "name": "POS Profile-posa_local_storage",
+  "mandatory_depends_on": "0",
+  "modified": "2020-10-09 16:05:54.332880",
+  "name": "POS Profile-posa_allow_submissions_in_background_job",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -2497,15 +2550,15 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": null,
+  "default": "1",
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_search_serial_no",
+  "fieldname": "posa_local_storage",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -2517,12 +2570,12 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_local_storage",
-  "label": "Search by Serial Number",
+  "insert_after": "posa_allow_submissions_in_background_job",
+  "label": "Use Browser Local Storage",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-06-20 20:47:47.966800",
-  "name": "POS Profile-posa_search_serial_no",
+  "modified": "2020-11-13 22:14:13.683091",
+  "name": "POS Profile-posa_local_storage",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -2596,6 +2649,59 @@
   "unique": 0,
   "width": null
  },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "POS Profile",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "posa_search_serial_no",
+  "fieldtype": "Check",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "posa_local_storage",
+  "label": "Search by Serial Number",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2021-06-20 20:47:47.966800",
+  "name": "POS Profile-posa_search_serial_no",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 0,
+  "unique": 0,
+  "width": null
+ },
  {
   "allow_in_quick_entry": 0,
   "allow_on_submit": 0,

diff --git a/posawesome/hooks.py b/posawesome/hooks.py
@@ -219,6 +219,8 @@
                     "POS Profile-posa_tax_inclusive",
                     "POS Profile-posa_use_percentage_discount",
                     "POS Profile-posa_allow_customer_purchase_order",
+                    "POS Profile-posa_allow_print_last_invoice",
+                    "POS Profile-posa_display_additional_notes",
                 ),
             ]
         ],

diff --git a/posawesome/public/js/posapp/components/pos/Invoice.vue b/posawesome/public/js/posapp/components/pos/Invoice.vue
@@ -452,10 +452,7 @@
                   </v-col>
                   <v-col
                     cols="8"
-                    v-if="
-                      pos_profile.posa_allow_sales_order &&
-                      invoiceType == 'Order'
-                    "
+                    v-if="pos_profile.posa_display_additional_notes"
                   >
                     <v-textarea
                       class="pa-0"
@@ -792,6 +789,7 @@ export default {
             this.items.unshift(new_item);
           }
         }
+        this.set_serial_no(cur_item)
       }
       this.$forceUpdate();
     },
@@ -1444,6 +1442,7 @@ export default {
     },
 
     set_serial_no(item) {
+      if (!item.has_serial_no) return;
       item.serial_no = '';
       item.serial_no_selected.forEach((element) => {
         item.serial_no += element + '\n';

diff --git a/posawesome/public/js/posapp/components/pos/Payments.vue b/posawesome/public/js/posapp/components/pos/Payments.vue
@@ -378,7 +378,7 @@
               </template>
             </v-autocomplete>
           </v-col>
-          <v-col cols="12" v-if="invoice_doc.posa_delivery_date">
+          <v-col cols="12" v-if="pos_profile.posa_display_additional_notes">
             <v-textarea
               class="pa-0"
               outlined
@@ -1052,12 +1052,12 @@ export default {
 
   computed: {
     total_payments() {
-      let total = flt(this.invoice_doc.loyalty_amount);
+      let total = parseFloat(this.invoice_doc.loyalty_amount);
       this.invoice_doc.payments.forEach((payment) => {
-        total += flt(payment.amount);
+        total += parseFloat(payment.amount);
       });
 
-      total += flt(this.redeemed_customer_credit);
+      total += parseFloat(this.redeemed_customer_credit);
 
       if (!this.is_cashback) total = 0;