From 9ae7c0d90129344fd34d57e893f8f41cff7fe502 Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Tue, 26 Nov 2024 13:50:49 +0530 Subject: [PATCH] FIX_DESIGN ISSUES IN REPORTS --- app/Controllers/Invoice.php | 10 ++---- app/Controllers/Payment.php | 6 +++- app/Models/InvoiceModel.php | 2 +- app/Views/invoice_form.php | 2 +- .../itemwise_report_with_payment_method.php | 10 ++++-- app/Views/received_payments_report.php | 33 ++++++++++--------- app/Views/report_book_publish.php | 17 +++++----- app/Views/report_expired_customers.php | 10 ++++-- app/Views/report_general_invoice.php | 20 +++++------ app/Views/report_itemwise.php | 13 +++++--- app/Views/report_userwise_and_eventwise.php | 10 ++++-- app/Views/subscribers_list.php | 4 +-- 12 files changed, 74 insertions(+), 63 deletions(-) diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index 95c21b1c..6ba3a077 100755 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -1195,14 +1195,8 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_ $data['selected_data'] = $this->request->getVar('date'); $this->logger->info("Itemwise Report "); } - $this->logger->info("'Membership Renewals Report'"); - if (empty($data['selected_data'])){ - //dd($data['selected_data']); - $data['page_name'] = 'Membership Renewals Report (30 days)'; - }else{ - list($fromDate, $toDate) = explode(" - ", $data['selected_data']); - $data['page_name'] = 'Membership Renewals Report -
(From '.$fromDate.' To '.$toDate.')'; - } + + $data['page_name'] = 'Membership Renewals Report (30 days)'; $this->render_page('report_expired_customers', $data); } diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php index 1421329d..b26477db 100644 --- a/app/Controllers/Payment.php +++ b/app/Controllers/Payment.php @@ -204,6 +204,7 @@ public function payment_success() { 'billing_address'=> $address['address_1'], 'billing_address_id' => isset($address['customer_address_id']) ? $address['customer_address_id'] : '', 'payment_method' => $payment_method, + 'business_id' =>2 //ask vel ]; $model->save($data); $update_invoice_numbering = [ @@ -260,7 +261,10 @@ public function payment_success() { 'is_renew' => 1, 'business_id'=>2, 'status' =>1, - 'membership_id' =>$membership_id + 'membership_id' =>$membership_id, + 'isactive' =>1, + 'business_id' =>2 //ask vel + ]; $db->table('subscription')->insert($subscriptionData); diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php index 70e3deb3..0219114d 100755 --- a/app/Models/InvoiceModel.php +++ b/app/Models/InvoiceModel.php @@ -147,7 +147,7 @@ public function getJoinedData($where, $orderby = []) // Print the last executed query - // echo $this->db->getLastQuery();die; + //echo $this->db->getLastQuery();die; return $resultArray; } diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index 8a744bb9..58082393 100755 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -1559,7 +1559,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d return b.is_renew - a.is_renew; }); if (cm.length > 0) { - text1 = cm[0].is_renew == 1 ? " - Renewal" : ""; + text1 = cm[0].is_renew == 1 ? " - Renewed" : ""; text2 = cm[0].isactive == 0 ? " - Expried" : ""; $(".subscribedetails").show(); // Change this line to use the class selector let message = "Earlier Membership : " + cm[0].title + " ( From: " + cm[0].formatted_from_subscription + " To: " + cm[0].formatted_to_subscription + " )" + text1 + text2; diff --git a/app/Views/itemwise_report_with_payment_method.php b/app/Views/itemwise_report_with_payment_method.php index c7099b3d..2a5d0544 100644 --- a/app/Views/itemwise_report_with_payment_method.php +++ b/app/Views/itemwise_report_with_payment_method.php @@ -1,12 +1,15 @@ -
+
+

-
-
+ + +
+
@@ -21,6 +24,7 @@
+
diff --git a/app/Views/received_payments_report.php b/app/Views/received_payments_report.php index ef94f2d6..d75f036b 100644 --- a/app/Views/received_payments_report.php +++ b/app/Views/received_payments_report.php @@ -35,15 +35,17 @@ -
-
-
-

-
+
+ +
+
+

- -
- +
+ + +
+
@@ -55,8 +57,9 @@
-
-
+
+
+
@@ -64,31 +67,31 @@
  • > - UPI - ₹ + UPI ₹
  • > - CASH - ₹ + CASH ₹
  • > - DEBIT CARD - ₹ + DEBIT CARD ₹
  • > - CREDIT CARD - ₹ + CREDIT CARD ₹
  • > - BANK TRANSFER - ₹ + BANK TRANSFER ₹
    • diff --git a/app/Views/report_book_publish.php b/app/Views/report_book_publish.php index 89624692..f73ad7d4 100755 --- a/app/Views/report_book_publish.php +++ b/app/Views/report_book_publish.php @@ -1,22 +1,20 @@ -
    +
    +

    -
    -
    + + +
    +
    -
    - - -
    - +
    -
    @@ -25,6 +23,7 @@
    +
    diff --git a/app/Views/report_expired_customers.php b/app/Views/report_expired_customers.php index 10d9f56a..97767d38 100755 --- a/app/Views/report_expired_customers.php +++ b/app/Views/report_expired_customers.php @@ -1,11 +1,14 @@ -
    -
    +
    + +

    -
    + + +
    @@ -21,6 +24,7 @@
    +
    diff --git a/app/Views/report_general_invoice.php b/app/Views/report_general_invoice.php index 01a28cda..6ee80ff0 100755 --- a/app/Views/report_general_invoice.php +++ b/app/Views/report_general_invoice.php @@ -1,33 +1,29 @@ -
    +
    +

    -
    - + + +
    +
    -
    - - - -
    - +
    -
    - -
    +
    diff --git a/app/Views/report_itemwise.php b/app/Views/report_itemwise.php index 96a80f5a..1066c98b 100755 --- a/app/Views/report_itemwise.php +++ b/app/Views/report_itemwise.php @@ -24,19 +24,21 @@ -
    +
    +

    -
    -
    - + + +
    +
    - +
    @@ -46,6 +48,7 @@
    +
    diff --git a/app/Views/report_userwise_and_eventwise.php b/app/Views/report_userwise_and_eventwise.php index b56c172a..357fd858 100644 --- a/app/Views/report_userwise_and_eventwise.php +++ b/app/Views/report_userwise_and_eventwise.php @@ -1,12 +1,15 @@ -
    +
    +

    -
    -
    + + +
    +
    @@ -21,6 +24,7 @@
    +
    diff --git a/app/Views/subscribers_list.php b/app/Views/subscribers_list.php index 5a0bf486..7ae018e3 100755 --- a/app/Views/subscribers_list.php +++ b/app/Views/subscribers_list.php @@ -37,8 +37,8 @@ Member's Mobile From Subscription To Subscription - Short-Code Expiring Status + Short-Code Invoice Number Total (₹) Status @@ -96,8 +96,8 @@ - +