vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-12-12 17:48:23 +05:30
commit 07914f40ae
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Config/Routes.php
View File

@ -132,7 +132,7 @@ $routes->match(['get','post'],'/itemwise_report','Invoice::itemwise_report');
# Notifications Routes # Notifications Routes
// $routes->get('controller/SubExpdetail/(:num)', 'YourController::SubExpdetail/$1'); // $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->get('send_whatsapp_message/', 'Notifications::send_whatsapp_message');
$routes->post('whatsapp_custom_notifications/', 'Notifications::whatsapp_custom_notifications'); $routes->post('whatsapp_custom_notifications/', 'Notifications::whatsapp_custom_notifications');
$routes->match(['post', 'get'], 'mail_custom_notifications', 'Notifications::mail_custom_notifications'); $routes->match(['post', 'get'], 'mail_custom_notifications', 'Notifications::mail_custom_notifications');

2
app/Controllers/BaseController.php
View File

@ -65,7 +65,7 @@ abstract class BaseController extends Controller
echo "This is a command-line request."; echo "This is a command-line request.";
// echo $requestedRoute; // echo $requestedRoute;
} else { } else {
if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate') { if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate' && $uri->getSegment(1) != 'getExpCustomerDetail') {
$this->authData = $this->session_log(); $this->authData = $this->session_log();
} }

9
app/Controllers/Subscription.php
View File

@ -140,23 +140,20 @@ public function download_details()
'orientation' => 'P', // Portrait 'orientation' => 'P', // Portrait
]; ];
$configA4 = [ $configa4 = [
'mode' => 'utf-8', 'mode' => 'utf-8',
'format' => [101.6 * 2, 152.4 * 4], // 2x4 inches for each label 'format' => 'A4',
'default_font_size' => 12,
'default_font' => 'Arial',
'margin_left' => 0, 'margin_left' => 0,
'margin_right' => 0, 'margin_right' => 0,
'margin_top' => 0, 'margin_top' => 0,
'margin_bottom' => 0, 'margin_bottom' => 0,
'margin_header' => 0, 'margin_header' => 0,
'margin_footer' => 0, 'margin_footer' => 0,
'orientation' => 'P', // Portrait
]; ];
if($action == 1) $pdf = new Mpdf($config); if($action == 1) $pdf = new Mpdf($config);
else $pdf = new Mpdf(); else $pdf = new Mpdf($configa4);
$customerDetails = []; $customerDetails = [];
// Iterate through selected schemes // Iterate through selected schemes
if (!empty($selectedSchemes)) { if (!empty($selectedSchemes)) {

4
app/Views/print_addresses_form.php
View File

@ -11,12 +11,12 @@
} }
.invoice { .invoice {
width: 48%; width: 48%;
height: 225px; height: 277px;
margin-left: 2px; margin-left: 2px;
float: left; float: left;
page-break-inside: avoid; page-break-inside: avoid;
padding-right: 2px !important; padding-right: 2px !important;
border: 2px solid #FFFF00; border: 4px solid #FFFF00;
box-sizing: border-box; box-sizing: border-box;
} }
.header { .header {