phyusin 47b59cca59 remove conflict data

2018-07-10 18:13:41 +06:30

..

addorders_controller.rb

update optimization

2018-07-05 18:19:16 +06:30

alipay_controller.rb

credit payment function

2018-07-10 18:12:25 +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

credit payment function

2018-07-10 18:12:25 +06:30

credit_sales_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

customers_controller.rb

…

dashboard_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

dinga_controller.rb

…

discounts_controller.rb

…

gift_voucher_controller.rb

…

home_controller_bk.rb

…

home_controller.rb

remove conflict

2018-07-09 09:44:36 +06:30

in_duties_controller.rb

check induties process

2018-06-26 18:22:53 +06:30

jcb_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

junction_pay_controller.rb

…

master_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

moveroom_controller.rb

update issuse

2018-06-27 10:29:23 +06:30

movetable_controller.rb

update booking today and yesterday

2018-06-26 14:16:18 +06:30

mpu_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

order_reservation_controller.rb

order reservation

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

orders_controller.rb

UI for credit payment

2018-07-04 18:46:13 +06:30

other_charges_controller.rb

…

others_payments_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

paymal_controller.rb

…

payments_controller.rb

remove conflict data

2018-07-10 18:13:41 +06:30

paypar_payments_controller.rb

…

pending_order_controller.rb

…

product_commissions_controller.rb

…

quick_service_controller.rb

…

redeem_payments_controller.rb

…

request_bills_controller.rb

check induties process

2018-06-26 18:22:53 +06:30

room_invoices_controller.rb

…

rooms_controller.rb

remove conflict

2018-07-09 09:44:36 +06:30

sale_edit_controller.rb

…

sales_controller.rb

UI for credit payment

2018-07-04 18:46:13 +06:30

second_display_controller.rb

update optimization

2018-07-05 18:19:16 +06:30

shifts_controller.rb

update other charge add to recipt bill and close pdf

2018-07-10 15:16:49 +06:30

split_bill_controller.rb

…

surveys_controller.rb

…

table_invoices_controller.rb

…

unionpay_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

visa_controller.rb

credit payment function

2018-07-10 18:12:25 +06:30

void_controller.rb

update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf

2018-07-10 16:10:04 +06:30

voucher_controller.rb

…

waste_spoile_controller.rb

update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf

2018-07-10 16:10:04 +06:30