phyusin bd06e80b37 remove conflict data

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

..

addorders

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

cash_ins

update design pages

2017-11-09 12:01:22 +06:30

cash_mgmt

UI change

2017-10-23 11:38:10 +06:30

cash_outs

update design pages

2017-11-09 12:01:22 +06:30

credit_payments

update quick service payment view

2018-02-05 11:21:52 +06:30

customers

update no table quick srevice

2018-02-14 18:21:10 +06:30

dashboard

remove conflict data

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

discounts

check discount calculation

2018-02-28 13:55:24 +06:30

home

remove conflict data

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

in_duties

change UI and query for dashboard and UI for Origami/Commissions

2017-11-23 11:56:49 +06:30

jcb

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

master

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

moveroom

update design pages

2017-11-09 12:01:22 +06:30

movetable

check booking in movetable

2018-01-16 13:22:58 +06:30

mpu

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

orders

update quick service for split bill

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

other_charges

update no table quick srevice

2018-02-14 18:21:10 +06:30

others_payments

update quick service payment view

2018-02-05 11:21:52 +06:30

payments

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

paypar_payments

update quick service payment view

2018-02-05 11:21:52 +06:30

pending_order

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

product_commissions

update design pages

2017-11-09 12:01:22 +06:30

quick_service

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

redeem_payments

update quick service payment view

2018-02-05 11:21:52 +06:30

request_bills

UI change

2017-10-23 11:38:10 +06:30

room_invoices

UI change

2017-10-23 11:38:10 +06:30

rooms

remove conflict data

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

sale_edit

fixed conflic when pull master item remark

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

sales

update complete repritn

2018-01-22 19:16:15 +06:30

shifts

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

2018-02-08 11:09:21 +06:30

split_bill

check order item

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

surveys

check some function

2018-02-19 18:05:30 +06:30

table_invoices

add link for oqs in origami

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

unionpay

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

visa

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

voucher

update quick service payment view

2018-02-05 11:21:52 +06:30