Commit Graph

744 Commits

Author SHA1 Message Date
Aung Myo
bf0a8135f6 update rebate for credit and redeem 2017-11-15 17:54:59 +06:30
Aung Myo
ef253cd1dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-15 13:40:35 +06:30
Aung Myo
308d9eefde update booking search 2017-11-15 13:40:09 +06:30
Yan
e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 12:06:55 +06:30
Aung Myo
1c0a93d56d update pagination and booking and rebate redeem 2017-11-15 12:02:02 +06:30
Yan
12f75ff403 licensing 2017-11-15 12:01:49 +06:30
Yan
7c6153f16f licensing 2017-11-15 12:01:35 +06:30
Yan
5ec45593de licensing 2017-11-14 18:35:25 +06:30
Yan
93769bacb7 licensing 2017-11-14 18:35:14 +06:30
Aung Myo
28dbb75774 update rebate and update api 2017-11-14 18:30:57 +06:30
Yan
222114a3c3 licensing 2017-11-14 16:06:17 +06:30
Yan
36275b55c6 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 15:54:17 +06:30
Yan
683982d4f5 adding license 2017-11-14 15:11:16 +06:30
Yan
54f68bdfc5 remove byebun in license rb 2017-11-14 13:46:24 +06:30
Aung Myo
6f06e7a9d7 add booking list in transaction 2017-11-14 13:42:00 +06:30
Yan
a6252923f1 test license 2017-11-10 19:03:10 +06:30
Yan
97fd7619ce license test 2017-11-10 18:08:48 +06:30
Yan
4ad65c5480 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-10 14:35:05 +06:30
Yan
3a71b86695 add license and encryption for cloud 2017-11-10 14:34:46 +06:30
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +06:30
Yan
4ce8fe48bc license for master 2017-11-10 14:15:05 +06:30
Yan
a70f9a43e6 license 2017-11-10 14:11:10 +06:30
Yan
fb64041a3f Merge branch 'master' into license 2017-11-10 11:30:05 +06:30
Yan
b82099368f fix edit dining charges 2017-11-10 11:29:45 +06:30
Yan
e5f1a44551 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 18:31:16 +06:30
Yan
053a8dbf8a activation form 2017-11-09 18:30:20 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30
Yan
09dcbaf9f2 license and AES 2017-11-09 15:47:16 +06:30
Yan
310ba78ef5 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 14:42:18 +06:30
Yan
99cfc19392 add AES key 2017-11-09 14:41:56 +06:30
Yan
121338677c add license 2017-11-09 14:41:35 +06:30
Aung Myo
cb91ad307a update shop form 2017-11-09 14:40:15 +06:30
Yan
66ae94c3e2 fix dining charges for room 2017-11-09 11:51:49 +06:30
Yan
d928deaa2f fix dining and change price for total price not (qty*unit_price) for sale item in bill 2017-11-08 17:12:36 +06:30
Yan
21498fc714 update seed 2017-11-07 15:27:48 +06:30
Yan
758b36000e origami numpad ui fix and promotion fix 2017-11-07 14:48:33 +06:30
Yan
4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
d5efe1402f add survey 2017-11-06 18:23:38 +06:30
Yan
7e19dbc1b6 merge with aung myo 2017-11-06 13:45:26 +06:30
Aung Myo
ce49f81440 update update void print and sale item report 2017-11-06 13:42:04 +06:30
Yan
6a8bf490d8 fix sale item report and bill print 2017-11-06 12:33:41 +06:30
Yan
d4e73a18d1 sale receipt no 2017-11-04 15:00:18 +06:30
Aung Myo
ebb2114243 update payment method report and from,to time change 2017-11-01 16:14:45 +06:30
Aung Myo
01c4eeca81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 18:05:29 +06:30
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +06:30
Yan
4ce8a0afbb check for payment methods 2017-10-31 15:57:50 +06:30
Yan
cd11841df1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 13:41:36 +06:30
Yan
89381eb72b add manage in ability for supervisor 2017-10-31 13:34:52 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30