phyusin 2ac629f6e0 conflict

2018-04-11 18:01:46 +06:30

..

addorders_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

alipay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

bank_integration_controller.rb

…

card_payments_controller.rb

Change Dashboard, Account in login, Shop name, Reference no for other charges

2018-02-28 15:31:55 +06:30

cash_ins_controller.rb

…

cash_mgmt_controller.rb

…

cash_outs_controller.rb

…

check_in_process_controller.rb

…

credit_payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

customers_controller.rb

add paymal and dinga with account no

2018-04-11 16:18:42 +06:30

dashboard_controller.rb

…

dinga_controller.rb

add paymal and dinga with account no

2018-04-11 16:18:42 +06:30

discounts_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

home_controller_bk.rb

…

home_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

in_duties_controller.rb

…

jcb_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

junction_pay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

master_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

moveroom_controller.rb

…

movetable_controller.rb

conflict

2018-04-11 18:01:46 +06:30

mpu_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

order_reservation_controller.rb

update order & reservation

2018-04-09 11:51:39 +06:30

orders_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

other_charges_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

others_payments_controller.rb

…

paymal_controller.rb

add paymal and dinga with account no

2018-04-11 16:18:42 +06:30

payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

paypar_payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

pending_order_controller.rb

remove conflict data

2018-03-05 16:24:45 +06:30

product_commissions_controller.rb

…

quick_service_controller.rb

update request bill msg box error

2018-04-10 17:29:02 +06:30

redeem_payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

request_bills_controller.rb

update request bill msg box error

2018-04-10 17:29:02 +06:30

room_invoices_controller.rb

Change Dashboard, Account in login, Shop name, Reference no for other charges

2018-02-28 15:31:55 +06:30

rooms_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

sale_edit_controller.rb

…

sales_controller.rb

Change Dashboard, Account in login, Shop name, Reference no for other charges

2018-02-28 15:31:55 +06:30

second_display_controller.rb

Second Display Image finished

2018-03-29 10:03:21 +06:30

shifts_controller.rb

…

split_bill_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

surveys_controller.rb

check user agent and token when webview is loaded

2018-04-06 15:36:08 +06:30

table_invoices_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

unionpay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

visa_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

void_controller.rb

update waste and spoilage

2018-03-30 14:20:47 +06:30

voucher_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

waste_spoile_controller.rb

…