Update and new files for karenderia merchant app modules

Modules

Updated files

• views/index/privacy_policy.php - new file
• views/index/auto_order.php
• views/index/settings_printer.php
• components/MerchantMenu.php
• components/MerchantWrapper.php
• components/OrderWrapper.php
• controllers/AjaxController.php
• controllers/ApiController.php
• controllers/IndexController.php
• controllers/UpdateController.php
• translation-file/merchantappv2.php
• Merchantappv2Module.php

Mobile app files

Updated files

• www/images/location-pin.png - new file
• www/images/street-map.png - new file
• www/js/lib/jquery-3.5.1.min.js - new file update jquery library
• www/css/app.css
• www/js/app.js
• www/js/bluetooth.js
• www/js/template.js
• www/index.html
• config.xml

Database update

1. add new fields in table printer_list_new = auto_print_after_accepted

Update KMRS with new templates

open the file protected/controller/AdminController.php look for function actionEmailTPL()

after the line

'order_request_cancel_to_admin'=>array(
   'email'=>true,
   'sms'=>true,		       
   'push'=>false, 
   'email_tag'=>'customer_name,order_id,restaurant_name,sitename,siteurl', 
   'sms_tag'=>'customer_name,order_id,restaurant_name,sitename,siteurl', 
 ),
		     
add 

'food_is_done_to_driver'=>array(
   'email'=>false,
   'sms'=>false,		       
   'push'=>true, 
   'email_tag'=>'', 
   'sms_tag'=>'', 
   'push_tag'=>'task_id,order_id,customer_name,notes,delivery_date,delivery_address,driver_name', 
 ),
 
 'auto_order_update'=>array(
   'email'=>false,
   'sms'=>false,		       
   'push'=>true, 
   'email_tag'=>'', 
   'sms_tag'=>'', 
   'push_tag'=>'task_id,order_id', 
 ),
 
 'driver_update_to_merchant'=>array(
   'email'=>false,
   'sms'=>false,		       
   'push'=>true, 
   'email_tag'=>'', 
   'sms_tag'=>'', 
   'push_tag'=>'task_id,order_id', 
 )

open the file protected/controllers/AjaxadminController.php look for function actionsaveTemplateSettings()

after the line

'offline_new_bank_deposit_email',
'offline_new_bank_deposit_sms',		  

add

'food_is_done_to_driver_push',
'auto_order_update_push',
'driver_update_to_merchant_push',