Yan
|
ea02f6b8fc
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-11 14:05:35 +06:30 |
|
Yan
|
efb60e6f79
|
add calc tax order in sale
|
2017-09-11 14:05:19 +06:30 |
|
Yan
|
b4ceff9631
|
add calc tax order flag in shop table
|
2017-09-11 13:56:49 +06:30 |
|
Phyo
|
fa7fcdd559
|
Room Charges(Account ID change,add dropdown list,tac not calculate)
|
2017-09-11 13:55:38 +06:30 |
|
Yan
|
10bd525d02
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix
|
2017-09-08 13:50:55 +06:30 |
|
Phyo
|
69c52bf28b
|
Dininng Charges Free time Count Change
|
2017-09-08 13:45:52 +06:30 |
|
Phyo
|
e7f1964a78
|
Promotion over two promotion products
|
2017-09-08 11:38:34 +06:30 |
|
Yan
|
3e76509347
|
remove console log
|
2017-09-07 18:06:59 +06:30 |
|
Yan
|
3d7295c081
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-07 15:37:12 +06:30 |
|
Yan
|
f67d4197ec
|
add bill channel for req bill
|
2017-09-07 15:35:00 +06:30 |
|
Yan
|
e9a305b573
|
remove auto refresh in origami
|
2017-09-07 13:55:40 +06:30 |
|
Zin Lin Phyo
|
43cc308d89
|
stock check report
|
2017-09-07 10:30:20 +06:30 |
|
Yan
|
a50becb365
|
merge with august_spring
|
2017-09-06 18:32:45 +06:30 |
|
Zin Lin Phyo
|
2e53b72574
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Timepicker Bug Fix
Show data in Edit
Promotion Destory Bug Fix
|
2017-09-06 18:28:09 +06:30 |
|
Zin Lin Phyo
|
5e1e0cd5b9
|
stock_check report template
|
2017-09-06 18:27:58 +06:30 |
|
Phyo
|
9d47414292
|
Timepicker Bug Fix
|
2017-09-06 18:03:53 +06:30 |
|
Phyo
|
4ca3b708c4
|
Show data in Edit
|
2017-09-06 17:01:33 +06:30 |
|
Aung Myo
|
a9d31935a1
|
update addorder bugs
|
2017-09-06 13:22:46 +06:30 |
|
Zin Lin Phyo
|
784e740da3
|
rename in_juty to in_duty
|
2017-09-06 11:18:02 +06:30 |
|
Aung Myo
|
d1db57e9b5
|
update oqs action cable sorting
|
2017-09-05 18:06:57 +06:30 |
|
Aung Myo
|
bb6e938f47
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 16:51:41 +06:30 |
|
Zin Lin Phyo
|
31021813b0
|
inventory list and stock check
|
2017-09-05 16:47:50 +06:30 |
|
Yan
|
6a04f2b213
|
del menu images
|
2017-09-05 14:17:00 +06:30 |
|
Yan
|
995ee8298e
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:14:10 +06:30 |
|
Yan
|
721f142971
|
Merge branch 'master-bug-fix' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:13:26 +06:30 |
|
Yan
|
3dc7fea339
|
date format fix for promotion
|
2017-09-05 14:12:53 +06:30 |
|
Aung Myo
|
4a85039170
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 14:07:20 +06:30 |
|
Yan
|
0dba573607
|
Merge branch 'master-bug-fix'
|
2017-09-05 13:54:09 +06:30 |
|
Yan
|
d0a527d1ee
|
code review and fix
|
2017-09-05 13:53:06 +06:30 |
|
Phyo
|
f56b7ab26e
|
Promotion Destory Bug Fix
|
2017-09-05 10:44:33 +06:30 |
|
Yan
|
c64541a410
|
Merge branch 'master-bug-fix'
|
2017-09-05 10:38:57 +06:30 |
|
Yan
|
4b4f44f37e
|
code reviews and add bootstrp font
|
2017-09-05 10:38:37 +06:30 |
|
Aung Myo
|
eeb2a91ce9
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 09:41:05 +06:30 |
|
Yan
|
081710e71c
|
Merge branch 'master-bug-fix'
|
2017-09-04 18:04:17 +06:30 |
|
Yan
|
e6ee2c43df
|
add public/image to gitignore
|
2017-09-04 18:01:48 +06:30 |
|
Yan
|
a4884c9bea
|
item instance code add to sale_item
|
2017-09-04 15:10:26 +06:30 |
|
Yan
|
008da6ee47
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix
|
2017-09-04 14:58:30 +06:30 |
|
Yan
|
fc6dd212c3
|
image add in gitignore
|
2017-09-04 14:53:02 +06:30 |
|
Zin Lin Phyo
|
6c94ba5457
|
in_juty ui update
|
2017-09-04 14:47:58 +06:30 |
|
Yan
|
82120e2ba1
|
updated commission for sale edit
|
2017-09-04 13:13:08 +06:30 |
|
Zin Lin Phyo
|
2330a1a33e
|
calculate commission in sale_edit, void, foc
|
2017-09-04 12:09:04 +06:30 |
|
Zin Lin Phyo
|
c2d86cb17c
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Promotion multiple order
|
2017-09-04 10:24:54 +06:30 |
|
Zin Lin Phyo
|
98dae6d712
|
show and update changes in commission and report
|
2017-09-04 10:24:24 +06:30 |
|
Phyo
|
2eaf891748
|
Promotion multiple order
|
2017-09-04 10:22:54 +06:30 |
|
Aung Myo
|
d715809b20
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-09-01 16:57:04 +06:30 |
|
Aung Myo
|
fc5192157b
|
update
|
2017-09-01 16:55:51 +06:30 |
|
Yan
|
e9e7aec028
|
update item edit
|
2017-09-01 16:03:55 +06:30 |
|
Nweni
|
09ba513c1c
|
fixed conflict
|
2017-09-01 09:42:10 +06:30 |
|
Nweni
|
ed17e5fd32
|
Update
|
2017-09-01 09:40:50 +06:30 |
|
Yan
|
3726e8a7c3
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 18:09:35 +06:30 |
|