From 567a353b1c9fc6caf1a8f9835622ba490f15c3e0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 12 Dec 2023 04:18:54 +0000 Subject: [PATCH 1/3] FIX_NOTIFICATION_ROUTE_CHANGE_CLI_TO_GET_METHOD --- app/Config/Routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index e9db508c..dcca67b8 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -132,7 +132,7 @@ $routes->match(['get','post'],'/itemwise_report','Invoice::itemwise_report'); # Notifications Routes // $routes->get('controller/SubExpdetail/(:num)', 'YourController::SubExpdetail/$1'); -$routes->cli("getExpCustomerDetail/(:num)",'Notifications::getExpCustomerDetail/$1'); +$routes->get("getExpCustomerDetail/(:num)",'Notifications::getExpCustomerDetail/$1'); $routes->get('send_whatsapp_message/', 'Notifications::send_whatsapp_message'); $routes->post('whatsapp_custom_notifications/', 'Notifications::whatsapp_custom_notifications'); $routes->match(['post', 'get'], 'mail_custom_notifications', 'Notifications::mail_custom_notifications'); From d2d48f8c93752cd00bce9719c61ec70332395505 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 12 Dec 2023 04:22:21 +0000 Subject: [PATCH 2/3] FIX_SESSION_CHECK_REMOVED_EXP_NOTIFY_URL --- app/Controllers/BaseController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 3ec85cdf..6e1d46cf 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -65,7 +65,7 @@ abstract class BaseController extends Controller echo "This is a command-line request."; // echo $requestedRoute; } else { - if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate') { + if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate' && $uri->getSegment(1) != 'getExpCustomerDetail') { $this->authData = $this->session_log(); } From b844160ab36f0461460139599ea278619963bac8 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 12 Dec 2023 17:45:47 +0530 Subject: [PATCH 3/3] ss --- app/Controllers/Subscription.php | 17 +++++++---------- app/Views/print_addresses_form.php | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/Controllers/Subscription.php b/app/Controllers/Subscription.php index c8352b11..00c31186 100644 --- a/app/Controllers/Subscription.php +++ b/app/Controllers/Subscription.php @@ -140,23 +140,20 @@ public function download_details() 'orientation' => 'P', // Portrait ]; - $configA4 = [ + $configa4 = [ 'mode' => 'utf-8', - 'format' => [101.6 * 2, 152.4 * 4], // 2x4 inches for each label - 'default_font_size' => 12, - 'default_font' => 'Arial', - 'margin_left' => 0, - 'margin_right' => 0, - 'margin_top' => 0, - 'margin_bottom' => 0, + 'format' => 'A4', + 'margin_left' => 0, + 'margin_right' => 0, + 'margin_top' => 0, + 'margin_bottom' => 0, 'margin_header' => 0, 'margin_footer' => 0, - 'orientation' => 'P', // Portrait ]; if($action == 1) $pdf = new Mpdf($config); - else $pdf = new Mpdf(); + else $pdf = new Mpdf($configa4); $customerDetails = []; // Iterate through selected schemes if (!empty($selectedSchemes)) { diff --git a/app/Views/print_addresses_form.php b/app/Views/print_addresses_form.php index 7fd8b3fd..d807cf4a 100644 --- a/app/Views/print_addresses_form.php +++ b/app/Views/print_addresses_form.php @@ -11,12 +11,12 @@ } .invoice { width: 48%; - height: 150px; + height: 277px; margin-left: 2px; float: left; page-break-inside: avoid; padding-right: 2px !important; - border: 2px solid #FFFF00; + border: 4px solid #FFFF00; box-sizing: border-box; } .header {