phyusin adefd8c034 remove conflict data

2018-02-27 14:35:21 +06:30

..

addorders_controller.rb

update waiter view add order

2018-02-26 09:19:14 +06:30

bank_integration_controller.rb

…

card_payments_controller.rb

…

cash_ins_controller.rb

…

cash_mgmt_controller.rb

…

cash_outs_controller.rb

…

check_in_process_controller.rb

…

credit_payments_controller.rb

…

customers_controller.rb

…

dashboard_controller.rb

add link for oqs in origami

2018-02-22 18:51:57 +06:30

discounts_controller.rb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

home_controller_bk.rb

…

home_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

in_duties_controller.rb

…

jcb_controller.rb

…

master_controller.rb

…

moveroom_controller.rb

…

movetable_controller.rb

…

mpu_controller.rb

…

orders_controller.rb

update quick service for split bill

2018-02-20 15:29:19 +06:30

other_charges_controller.rb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

others_payments_controller.rb

…

payments_controller.rb

conflict remove

2018-02-26 18:47:03 +06:30

paypar_payments_controller.rb

…

pending_order_controller.rb

update waiter view add order

2018-02-26 09:19:14 +06:30

product_commissions_controller.rb

…

quick_service_controller.rb

update waiter view add order

2018-02-26 09:19:14 +06:30

redeem_payments_controller.rb

…

request_bills_controller.rb

update waiter view add order

2018-02-26 09:19:14 +06:30

room_invoices_controller.rb

…

rooms_controller.rb

change assigned order item id to order item id in Origami/Room

2018-02-26 10:09:33 +06:30

sale_edit_controller.rb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

sales_controller.rb

…

shifts_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

split_bill_controller.rb

check order item

2018-02-27 11:33:51 +06:30

surveys_controller.rb

change split bill equal person flow

2018-02-21 18:24:04 +06:30

table_invoices_controller.rb

add link for oqs in origami

2018-02-22 18:51:57 +06:30

unionpay_controller.rb

…

visa_controller.rb

…

void_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

voucher_controller.rb

…