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

Merge branch 'uat' of bitbucket.org:venbainformationtechnology/vb_book into uat

Browse Source
This commit is contained in:
heama 2023-10-19 18:59:09 +05:30
commit 23684a827f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/ApiIntegration.php
View File

@ -1146,8 +1146,7 @@ class ApiIntegration extends ResourceController
$where = ['customer_id' =>$customer_id,'address_type'=>$flag, $where = ['customer_id' =>$customer_id,'address_type'=>$flag,
'first_name'=>$request_addr_array[0]->first_name,'last_name'=>$request_addr_array[0]->last_name, 'first_name'=>$request_addr_array[0]->first_name,'last_name'=>$request_addr_array[0]->last_name,
'address_1'=>$request_addr_array[0]->address_1,'address_2'=>$request_addr_array[0]->address_2, 'address_1'=>$request_addr_array[0]->address_1,'address_2'=>$request_addr_array[0]->address_2,
'city'=>$request_addr_array[0]->city,'state'=>$request_addr_array[0]->state, 'city'=>$request_addr_array[0]->city,'postal_code'=>$request_addr_array[0]->postcode];
'postal_code'=>$request_addr_array[0]->postcode];
$existing_addr = $api_model->getData('customer_addresses', $where); $existing_addr = $api_model->getData('customer_addresses', $where);
$this->logger->info("Api saveInvoiceAddressInCustomerAddress Count = ".count($existing_addr)); $this->logger->info("Api saveInvoiceAddressInCustomerAddress Count = ".count($existing_addr));
$final_array['addr_id'] = NULL; $final_array['addr_id'] = NULL;

5
app/Controllers/Notifications.php
View File

@ -9,7 +9,7 @@ class Notifications extends BaseController
{ {
## Email Section : ## Email Section :
public function mail_custom_notificationsi() public function mail_custom_notifications()
{ {
$request = \Config\Services::request(); $request = \Config\Services::request();
if ($request->is('post')) { if ($request->is('post')) {
@ -72,8 +72,7 @@ class Notifications extends BaseController
$this->render_page('notifications_form', $data); $this->render_page('notifications_form', $data);
} }
// public function due_date_notifications() public function due_date_notifications()
public function mail_custom_notifications()
{ {
$model = new NotificationModel(); $model = new NotificationModel();
$details = $model->getSubscriptionDueDetail(); $details = $model->getSubscriptionDueDetail();

5
app/Views/notifications_form.php
View File

@ -127,7 +127,7 @@
</div> </div>
<div id="whatsappFormDiv"> <div id="whatsappFormDiv">
<form role="form" class="parsley-examples" method="POST" enctype="multipart/form-data" action="<?= base_url() . "whatsapp_custom_notifications"; ?>"> <form role="form" class="parsley-examples" method="POST" enctype="multipart/form-data" action="<?= base_url() . "whatsapp_custom_notifications"; ?>">
<div class="form-group row"> <!-- <div class="form-group row">
<label for="group_id" class="col-4 col-form-label">Categories</label> <label for="group_id" class="col-4 col-form-label">Categories</label>
<div class="col-7"> <div class="col-7">
<select class="form-control" id="categories" name="categories"> <select class="form-control" id="categories" name="categories">
@ -136,7 +136,8 @@
<option value="SEND_WAAI_GROUP_URL">Group</option> <option value="SEND_WAAI_GROUP_URL">Group</option>
</select> </select>
</div> </div>
</div> </div> -->
<input type="hidden" id="categories" name="categories" value="SEND_WAAI_URL" />
<div id="fields-for-groupid" style="display: none;"> <div id="fields-for-groupid" style="display: none;">
<div class="form-group row"> <div class="form-group row">
<label for="group_id" class="col-4 col-form-label">Group Id</label> <label for="group_id" class="col-4 col-form-label">Group Id</label>