From 0ab6b686d935e0cc2145e926e11f1fd4f88ca906 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 3 May 2024 18:46:13 +0530 Subject: [PATCH] CHANGE_INVOCIE_NEW_CUSTOMER_CREATE_ADDRESS_NOT_ADD_ISSUE_BILLING_AND_SHIPPING_ADDRESS_ISSUE : AADHAVAN --- app/Controllers/Invoice.php | 6 +- app/Views/invoice_form.php | 164 +++++++++++++------ app/Views/invoice_print_preview_template.php | 5 +- app/Views/offline_invoice_list.php | 1 + app/Views/template/header.php | 30 ++++ 5 files changed, 149 insertions(+), 57 deletions(-) diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index 67a60e9e..e7d5a377 100644 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -670,9 +670,9 @@ class Invoice extends BaseController $this->logger->info("Approve notification Email Request data = " . json_encode($records)); $email_result = $notification->sendEmail($records); $this->logger->info("Approve notification Email Response = " . json_encode($email_result)); - $this->logger->info("Approve notification Whatsapp Request data = " . json_encode($params)); - $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params); - $this->logger->info("Approve notification Whatsapp Response = " . json_encode($whatsapp_result)); + // $this->logger->info("Approve notification Whatsapp Request data = " . json_encode($params)); + // $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params); + // $this->logger->info("Approve notification Whatsapp Response = " . json_encode($whatsapp_result)); } ## To Generate Invoice PDF based on invoice ID diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index fddefd83..c09a44fe 100644 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -16,6 +16,8 @@


" id="myForm"> + +
@@ -126,7 +128,6 @@ Item Details - Description Qty Rate Tax @@ -141,7 +142,8 @@ $ii_details) : ?> - bookSelect" name="item_details[]" onchange="displayBookTag(this,)" required data-toggle="select2" style="width: 249px !important;"> @@ -157,8 +159,9 @@ echo $book->title; } ?> - - + + + " name="quantity[]" oninput="calculateInvoice(this,)" value="" min="1" /> " name="rate[]" oninput="calculateInvoice(this,)" value="" readonly /> @@ -201,8 +204,9 @@ + - + @@ -616,8 +620,12 @@ Account No : 89900787655
+

Billing & Shipping Address

+
Billing Address
@@ -744,14 +752,14 @@ Account No : 89900787655 cell1.innerHTML = html; // cell1.innerHTML = ''; - cell2.innerHTML = ''; - cell3.innerHTML = ''; - cell4.innerHTML = ''; - cell5.innerHTML = ''; - cell6.innerHTML = ''; - cell7.innerHTML = ''; - cell8.innerHTML = ''; - cell9.innerHTML = '
'; + cell1.innerHTML += ''; + cell2.innerHTML = ''; + cell3.innerHTML = ''; + // cell4.innerHTML = ''; + cell4.innerHTML = ''; + cell5.innerHTML = ''; + cell6.innerHTML = ''; + cell7.innerHTML = '
'; $(newRow.querySelector('.book-select')).select2(); localStorage.setItem('add_book_index', counter); @@ -971,7 +979,10 @@ Account No : 89900787655 } if ((bill_addrid === "" || parseInt(bill_addrid) === 0)) { $('#editAddressesCheckbox').prop('checked', true); - $("#storeBillingAddress").prop("readonly", false); + // $("#storeBillingAddress").prop("readonly", false); + $("#storeBillingAddress").prop("readonly", true); + $("#storeShippingAddress").prop("readonly", true); + } $('#hiddenBillingAddressId').val(bill_addrid); get_customer_membership_details(custid) @@ -995,28 +1006,34 @@ Account No : 89900787655 $("#editAddressesCheckbox").on("change", function() { if ($(this).is(":checked")) { - $("#storeBillingAddress").prop("readonly", false); - $('#hiddenBillingAddressId').val(0); + + // $("#storeBillingAddress").prop("readonly", false); + $("#storeBillingAddress").prop("readonly", true); + $("#storeShippingAddress").prop("readonly", true); + $('#hiddenBillingAddressId').val(0); - $('#billing_shipping_addresses_modal').modal('show'); - $.ajax({ - type: "GET", - url: "", - success: function(response) { - var countries = JSON.parse(response); - - // Loop through the countries array - $.each(countries, function(index, country) { - // Append an '); - $('#shipping_country').append(''); - }); }, - error: function() { - alert("Error fetching address."); - } - }); + $('#billing_shipping_addresses_modal').modal('show'); + $.ajax({ + type: "GET", + url: "", + success: function(response) { + var countries = JSON.parse(response); + + // Loop through the countries array + $.each(countries, function(index, country) { + // Append an '); + $('#shipping_country').append(''); + }); }, + error: function() { + alert("Error fetching address."); + } + }); + } else { $("#storeBillingAddress").prop("readonly", true); + $("#storeShippingAddress").prop("readonly", true); + if (global_billarr !== "") { $("#storeBillingAddress").val(global_billarr); $('#hiddenBillingAddressId').val(global_billid); @@ -1047,7 +1064,8 @@ Account No : 89900787655 if (custid != '' && (ship_addrid == undefined || ship_addrid == null || ship_addrid == '0' || ship_addrid == '')) { - $("#storeShippingAddress").prop("readonly", false); + // $("#storeShippingAddress").prop("readonly", false); + $("#storeShippingAddress").prop("readonly", true); console.log('ship addrid is undefined, null, 0, or empty'); } @@ -1060,8 +1078,10 @@ Account No : 89900787655 $('#customerModal').modal('show'); }else if(cust_id != ''){ $('#editAddressesCheckbox').prop('checked', false); - $("#storeBillingAddress").prop("readonly", false); - $("#storeShippingAddress").prop("readonly", false); + // $("#storeBillingAddress").prop("readonly", false); + $("#storeBillingAddress").prop("readonly", true); + // $("#storeShippingAddress").prop("readonly", false); + $("#storeShippingAddress").prop("readonly", true); $('#customerModal').modal('hide'); $('#cus_mobile_no').val(""); $('#cus_first_name').val(""); @@ -1088,6 +1108,7 @@ Account No : 89900787655 global_billid = ""; var customer_billing_addressDetails = []; if (cb.length > 0) { + console.log("cbbbbbbbbb",cb); $.each(cb, function(k, v) { var state = v.state_name ? v.state_name : v.state; state = v.postal_code ? state + "-" + v.postal_code : state; @@ -1097,6 +1118,8 @@ Account No : 89900787655 v.country_name ? customer_billing_addressDetails.push(v.country_name) : ""; customer_billing_id = v.customer_address_id; }); + }else{ + } global_billarr = customer_billing_addressDetails.join(', \n') + "."; global_billid = customer_billing_id; @@ -1116,14 +1139,23 @@ Account No : 89900787655 }); $("#storeShippingAddress").val(''); } else { - $("#editAddressesCheckbox").prop("checked", true); - $("#storeBillingAddress").prop("readonly", false); + $('#loadShippingDropdown').empty(); + $('#loadShippingDropdown').append($('