Commit Graph

181 Commits

Author SHA1 Message Date
Yan
739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:40:43 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Yan
338c420850 update fix for customer 2017-08-10 18:02:50 +06:30
Yan
c522ba3cab merge with staging 2017-08-10 13:42:08 +06:30
Yan
fb8c67f058 fix for customer tax 2017-08-10 13:38:39 +06:30
Aung Myo
80d13ce1f9 finished sale summary quick view 2017-08-10 11:59:15 +06:30
Yan
0fc2fb1d98 calc tax by user taxes 2017-08-09 15:32:33 +06:30
Yan
1685713ff5 add customer tax 2017-08-08 18:02:05 +06:30
Yan
f46d786859 update crm 2017-08-08 14:29:48 +06:30
Yan
c096e82148 update shop in seed for osaka 2017-08-02 14:33:03 +06:30
Aung Myo
2d6841a4c4 update 2017-07-31 18:33:47 +06:30
Yan
124528c138 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-26 18:40:11 +06:30
Yan
ad2dfa2ee0 crm updated 2017-07-26 18:39:46 +06:30
Aung Myo
1de6cc906c update rounding adj for osaka 2017-07-26 16:35:34 +06:30
Yan
e693b60945 bind member for already register member 2017-07-26 16:00:15 +06:30
Yan
d01ec184f5 edit merchant code for bitp 2017-07-25 09:53:25 +06:30
Yan
bf9b977cd0 membership update 2017-07-24 19:24:43 +06:30
Yan
b37cef46bd Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant into osaka 2017-07-18 18:07:26 +06:30
Aung Myo
0ce6bc733b update membership rebate for food and beverage 2017-07-18 18:05:27 +06:30
Yan
b2ccc12e17 add paypar acc for nfc 2017-07-16 18:16:52 +06:30
Aung Myo
e34d267fc8 update control member for osaka 2017-07-12 19:43:56 +06:30
Aung Myo
1d873ddb68 update member discount and seed for detail 2017-07-12 17:05:10 +06:30
Yan
3fe0f708bd add req and fix for shift 2017-07-07 17:19:14 +06:30
Yan
1b0bcbffea update for shift and deving member dis 2017-07-07 14:56:05 +06:30
Aung Myo
b5b1c6f10a update membership 2017-07-04 18:01:08 +06:30
Aung Myo
b78119f848 update print 2017-07-02 11:41:47 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Yan
78be369a25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 16:00:37 +06:30
Yan
b0bec2afc4 add alt name to order and sale items and update seeds 2017-06-30 16:00:03 +06:30
Nweni
2713fae6b5 Update 2017-06-30 13:44:29 +06:30
Nweni
5e3935f176 update shift 2017-06-30 13:10:28 +06:30
Yan
fbeab17b3c merge with origin master 2017-06-29 14:08:20 +06:30
Nweni
618a89472a shift open/close 2017-06-29 13:35:09 +06:30
Aung Myo
58e95e573e update numberformat in pdf 2017-06-28 23:13:20 +06:30
Aung Myo
342b654f81 update print setting migration and delete unnessary font 2017-06-28 17:12:09 +06:30
Aung Myo
ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-28 12:47:18 +06:30
Min Zeya Phyo
ee651763b7 shift close and payment journal 2017-06-28 10:34:42 +06:30
Aung Myo
53ff3989b5 update merge cancan 2017-06-27 16:55:56 +06:30
Aung Myo
945963362a update queue migration 2017-06-27 15:25:13 +06:30
Aung Myo
25967b82d3 update home link 2017-06-26 20:44:15 +06:30
Aung Myo
75dd4db10f update seed 2017-06-26 19:33:29 +06:30
Yan
99ac82c888 update seed for shop and oqs 2017-06-26 19:28:02 +06:30
Yan
adf06cf6f5 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:02:25 +06:30
Aung Myo
6e77a71946 update customer seed shop and receipt bill 2017-06-26 16:50:04 +06:30
Phyo
ecabed5d5d Account type change 2017-06-23 18:45:46 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Yan
618aed50dc merge with settings_backend 2017-06-22 18:05:23 +06:30
Phyo
4254004423 Redeem Nett Button works 2017-06-22 15:36:36 +06:30
Yan
cb40f06854 fixed for customer 2017-06-22 15:01:13 +06:30