diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 898f3fbb..37b7e89a 100755
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -153,7 +153,7 @@ class Invoice extends BaseController
$where = ['customer_addresses.isactive' => 1, 'customer_addresses.customer_id' => (int)$id];
$where['address_type'] = 1;
$data['customer_billing'] = $this->get_customer_address($where, []);
- $select = ["customer_address_id", "CONCAT(address_1,' ',address_2) as address","first_name"];
+ $select = ["customer_address_id", "CONCAT(address_1,' ',address_2) as address"];
$where['address_type'] = 2;
$data['customer_shipping'] = $this->get_customer_address($where, $select);
return $this->response->setJSON(['data' => $data]);
diff --git a/app/Views/invoice_list.php b/app/Views/invoice_list.php
index 936f48a9..0be12d49 100755
--- a/app/Views/invoice_list.php
+++ b/app/Views/invoice_list.php
@@ -82,7 +82,7 @@
Invoice Date |
Customer Name |
Status |
- Total (₹) |
+ Total (₹) |
Action |
@@ -99,7 +99,7 @@
= $invoice_date; ?> |
= $row['customer_name']; ?> |
= $row['status']; ?> |
- = $row['total_amount']; ?> |
+ = $row['total_amount']; ?> |
" class="download-pdf-button" title="Download the Invoice">
" class="print-address-button" title="Print Address">
diff --git a/app/Views/itemwise_report_with_payment_method.php b/app/Views/itemwise_report_with_payment_method.php
index 322ce1a8..d5db80e6 100644
--- a/app/Views/itemwise_report_with_payment_method.php
+++ b/app/Views/itemwise_report_with_payment_method.php
@@ -38,8 +38,8 @@
| Publisher Total Cost |
Book Name |
Item Count |
- Total Cost |
Payment method |
+ Total Cost |
@@ -51,8 +51,8 @@
= number_format($row->publisher_total_cost, 2) ?> |
= $book->book_name ?> |
= $book->item_count ?> |
- = number_format($book->total_cost, 2) ?> |
- = strtoupper($row->payment_method) ?> |
+ = strtoupper($row->payment_method) ?> |
+ = number_format($book->total_cost, 2) ?> |
diff --git a/app/Views/offline_invoice_list.php b/app/Views/offline_invoice_list.php
index 45a65889..f02ee4e9 100755
--- a/app/Views/offline_invoice_list.php
+++ b/app/Views/offline_invoice_list.php
@@ -111,7 +111,7 @@
Invoice Date |
Customer Name |
Status |
- Total (₹) |
+ Total (₹) |
Action |
@@ -128,7 +128,7 @@
= $invoice_date; ?> |
= $row['customer_name']; ?> |
= $row['status']; ?> |
- = $row['total_amount']; ?> |
+ = $row['total_amount']; ?> |
" class="download-pdf-button" title="Download the Invoice">
" class="print-address-button" title="Print Address">
diff --git a/app/Views/received_payments_report.php b/app/Views/received_payments_report.php
index fec2a15c..018aa306 100644
--- a/app/Views/received_payments_report.php
+++ b/app/Views/received_payments_report.php
@@ -121,7 +121,7 @@
| Customer Name |
Payment Method |
Payment Status |
- Total Amount |
+ Total Amount |
@@ -134,8 +134,8 @@
= $invoice_date ?> |
= $row['first_name'] ?> |
= strtoupper($row['payment_method'])?> |
- = $row['payment_status'] ?> |
- = $row['total_amount'] ?> |
+ = $row['payment_status'] ?> |
+ = $row['total_amount'] ?> |
diff --git a/app/Views/report_book_publish.php b/app/Views/report_book_publish.php
index af1dd1b3..8a0c8883 100755
--- a/app/Views/report_book_publish.php
+++ b/app/Views/report_book_publish.php
@@ -45,8 +45,8 @@
Invoice Date |
Book Name |
Author |
- Published By |
- Cost |
+ Published By |
+ Cost |
@@ -58,8 +58,8 @@
invoice_date)) ?> |
title; ?> |
author; ?> |
- publishers_code?> |
- price ?> |
+ publishers_code?> |
+ price ?> |
diff --git a/app/Views/report_general_invoice.php b/app/Views/report_general_invoice.php
index 562438e7..1085203d 100755
--- a/app/Views/report_general_invoice.php
+++ b/app/Views/report_general_invoice.php
@@ -52,9 +52,7 @@
OT Charges (₹) |
GST (%) |
Total (₹) |
-
-
-
+
@@ -73,8 +71,7 @@
discount, 2, '.', ','); ?> |
shipping_charge, 2, '.', ','); ?> |
tax ? $row->tax : '0.00'; ?> |
- total_amount, 2, '.', ','); ?> |
-
+ total_amount, 2, '.', ','); ?> |
diff --git a/app/Views/report_itemwise.php b/app/Views/report_itemwise.php
index 725cd797..77e49abd 100755
--- a/app/Views/report_itemwise.php
+++ b/app/Views/report_itemwise.php
@@ -78,7 +78,7 @@
publisher_total_cost, 2); ?> |
book_name; ?> |
item_count; ?> |
- total_cost, 2); ?> |
+ total_cost, 2); ?> |
diff --git a/app/Views/report_userwise_and_eventwise.php b/app/Views/report_userwise_and_eventwise.php
index 783648de..5ad1f691 100644
--- a/app/Views/report_userwise_and_eventwise.php
+++ b/app/Views/report_userwise_and_eventwise.php
@@ -53,7 +53,7 @@
= $row['first_name'].' ('.$row['role'].')'?> |
= $row['books_sold'] ?> |
= strtoupper($row['payment_method'])?> |
- = $row['total_amount'] ?> |
+ = $row['total_amount'] ?> |