phyusin
|
41aa840eb2
|
conflict data
|
2018-02-06 18:12:59 +06:30 |
|
Aung Myo
|
313bcd5db9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2018-02-06 17:02:44 +06:30 |
|
phyusin
|
9387703862
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-06 16:17:27 +06:30 |
|
phyusin
|
0780744377
|
check booking with order item split
|
2018-02-05 16:57:46 +06:30 |
|
phyusin
|
2ebfdbe8bc
|
add updated qty text in oqs
|
2018-02-05 15:29:31 +06:30 |
|
phyusin
|
76e86bcfd4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-05 11:09:49 +06:30 |
|
phyusin
|
f84b01a058
|
change item unit price in sale ite report
|
2018-02-06 10:19:30 +06:30 |
|
phyusin
|
991bc48505
|
order item split bill process
|
2018-02-06 09:46:30 +06:30 |
|
Aung Myo
|
6657c11122
|
update cups restart for order
|
2018-02-01 17:14:34 +06:30 |
|
Aung Myo
|
9efd54e68b
|
update remove job from cable and cup control in print
|
2018-02-01 15:30:30 +06:30 |
|
Aung Myo
|
ddaa581b32
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2018-01-27 13:18:16 +06:30 |
|
phyusin
|
2a09945d36
|
check add to existing invoice
|
2018-01-28 16:29:59 +06:30 |
|
phyusin
|
aa129ad469
|
heck rounding adjustment error
|
2018-01-28 16:12:59 +06:30 |
|
Aung Myo
|
f4effe8dde
|
update rom and table show
|
2018-01-27 13:16:42 +06:30 |
|
phyusin
|
27300dfb81
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-25 17:34:24 +06:30 |
|
phyusin
|
61142b7244
|
add void in sale item again
|
2018-01-25 17:34:13 +06:30 |
|
Aung Myo
|
ca54fa21ab
|
Merge branch 'adminbsb_material_ui'
|
2018-01-25 15:34:48 +06:30 |
|
Aung Myo
|
142bac74a8
|
update payment action cable
|
2018-01-25 15:33:52 +06:30 |
|
phyusin
|
3c37852250
|
change query in sale
|
2018-01-25 14:24:59 +06:30 |
|
Yan
|
4248e53517
|
add sudo for sym run
|
2018-01-23 15:14:07 +06:30 |
|
Yan
|
773e1d2db0
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-23 14:40:44 +06:30 |
|
Yan
|
aa8c2621fc
|
add response in license
|
2018-01-23 14:40:32 +06:30 |
|
Aung Myo
|
8d2a928456
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-23 13:13:01 +06:30 |
|
Aung Myo
|
65292af9cb
|
update ablity for waiter
|
2018-01-23 13:12:42 +06:30 |
|
phyusin
|
8b99c8bcc6
|
cahnge empty json to NIL
|
2018-01-22 22:13:17 +06:30 |
|
phyusin
|
f28388ada1
|
change menu category code error in sale item
|
2018-01-22 16:19:13 +06:30 |
|
Aung Myo
|
63db49ca35
|
Merge branch 'adminbsb_material_ui'
|
2018-01-19 11:46:43 +06:30 |
|
Aung Myo
|
57425a6bc9
|
update sale item for set menu
|
2018-01-19 11:44:30 +06:30 |
|
Yan
|
3e92becfb6
|
update price in set item
|
2018-01-19 11:34:53 +06:30 |
|
Yan
|
384923133b
|
license flash msg and add set Item price
|
2018-01-19 10:43:08 +06:30 |
|
Yan
|
44f1db3073
|
check for order source emenu and cashier for set items
|
2018-01-18 12:20:20 +06:30 |
|
phyusin
|
7f127f63a7
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-18 11:23:27 +06:30 |
|
phyusin
|
45873672b6
|
add set menu items for template and code
|
2018-01-18 11:23:10 +06:30 |
|
Aung Myo
|
fdd5e3d2d7
|
Merge branch 'adminbsb_material_ui'
|
2018-01-18 11:03:01 +06:30 |
|
Aung Myo
|
b4fb8b2be6
|
update menu valid date and limit time ,addorder for parent order item id
|
2018-01-18 10:41:29 +06:30 |
|
Yan
|
a9c9f4d750
|
set items in order
|
2018-01-17 17:59:48 +06:30 |
|
Yan
|
43e9e2c993
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-17 14:47:24 +06:30 |
|
phyusin
|
9f9ec7af40
|
change pdf func:
|
2018-01-17 14:35:35 +06:30 |
|
Yan
|
ba00b84ba5
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-17 12:09:20 +06:30 |
|
phyusin
|
57f042aec2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-17 12:08:27 +06:30 |
|
phyusin
|
06686b06bb
|
add settings for order item, order summary slim and receiptbillA5, receiptbillShowAltName
|
2018-01-17 12:08:14 +06:30 |
|
Yan
|
0dc66e0273
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-17 12:06:29 +06:30 |
|
Aung Myo
|
ef816a5969
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2018-01-17 10:41:34 +06:30 |
|
Aung Myo
|
9396982261
|
update sale item price 0
|
2018-01-17 10:39:46 +06:30 |
|
phyusin
|
bc2d6e07f1
|
check empty for checkout time and checkout alert time
|
2018-01-16 14:59:47 +06:30 |
|
phyusin
|
d152d62e80
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-16 14:55:48 +06:30 |
|
phyusin
|
d8c62b0d44
|
change and check order_slim_pdf
|
2018-01-16 14:55:33 +06:30 |
|
Aung Myo
|
37d01f6903
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-16 14:32:50 +06:30 |
|
Aung Myo
|
7fadeeed2e
|
update suppervisor ability and room & table first bill
|
2018-01-16 14:32:24 +06:30 |
|
phyusin
|
5a5f47c946
|
add order_slim_pdf in settings/lookups and change order_slim_pdf
|
2018-01-16 14:21:50 +06:30 |
|