Commit Graph

515 Commits

Author SHA1 Message Date
Aung Myo
bf25d7697b update member discount 2017-07-11 18:47:36 +06:30
Aung Myo
3f8a5f8ef2 update discount 2017-07-11 18:38:55 +06:30
Aung Myo
600e8e47f4 update queue assign and member discount change 2017-07-11 18:26:36 +06:30
Aung Myo
28c51300cf update discount message 2017-07-11 15:45:01 +06:30
Yan
1e329d1c5f fix employee logout 2017-07-11 14:36:09 +06:30
Yan
ebf72f7d42 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-07-11 11:07:01 +06:30
Aung Myo
72aa769490 added member discount 2017-07-11 11:06:13 +06:30
Yan
152af3a3cb add table no and cus id in payment ui 2017-07-10 17:17:22 +06:30
Yan
082627018f dis fix 2017-07-10 16:23:37 +06:30
Yan
8e3eef06a2 Merge branch 'master' into discount 2017-07-10 12:08:03 +06:30
Yan
0031300947 dis ui calc fix and update for shift 2017-07-09 11:04:43 +06:30
Yan
c73cfa4c2d control to req bill and discount ui update 2017-07-08 23:29:31 +06:30
Yan
94555bc325 updated for receipt rpt for shift 2017-07-08 18:20:42 +06:30
Yan
9158f0e93a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-07-08 17:34:22 +06:30
Aung Myo
8985393535 update receipt repoert 2017-07-08 10:25:22 +06:30
Yan
b8b3a7e0a7 deving dis 2017-07-07 20:47:45 +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
040d60402b update edit qty and price and cash and credit div in payment details 2017-07-06 12:54:04 +06:30
Aung Myo
fcc9ed02a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-05 18:28:55 +06:30
Aung Myo
05b5afcafa update edit 2017-07-05 18:27:30 +06:30
Yan
3f4fbb7793 update payment cntr 2017-07-05 18:11:02 +06:30
Yan
efa7b8997b control normal user no call paypar 2017-07-05 17:59:15 +06:30
Aung Myo
7cee40746d update unsuccessfully rebate and alert 2017-07-05 14:42:40 +06:30
Aung Myo
7f6a306097 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-05 10:36:16 +06:30
Yan
d8ba15f6ce adm route to dashboard 2017-07-04 19:19:09 +06:30
Yan
d51b1a0b9e disable cable and oqs qty can 0 2017-07-04 18:56:52 +06:30
Aung Myo
b5b1c6f10a update membership 2017-07-04 18:01:08 +06:30
Yan
6a09ef3018 merge with crm and room fixed 2017-07-03 17:47:34 +06:30
Aung Myo
8aa12406db update scrll and member transaction 2017-07-03 17:44:26 +06:30
Yan
ed0e627f34 fixed at bitp and oqs print 2017-07-03 17:40:12 +06:30
Aung Myo
e3477fd268 update 2017-07-03 13:22:02 +06:30
Aung Myo
92712787e1 update origami for room 2017-07-03 12:20:03 +06:30
Aung Myo
6c3c863fce Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-03 10:29:07 +06:30
Aung Myo
39ba5d5e86 update audit sales 2017-07-03 10:28:13 +06:30
Phyo
dbf35be4ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 15:27:49 +06:30
Phyo
53aa1f8ec6 OQS bug fix 2017-07-02 15:26:52 +06:30
Nweni
9758628bde Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 14:38:40 +06:30
Nweni
9085362979 menu alt name 2017-07-02 14:38:18 +06:30
superuser
ca797b8d9c update conflict file 2017-07-02 14:37:21 +06:30
Nweni
f06e526ea3 menu alt name 2017-07-02 14:36:57 +06:30
Aung Myo
e9ac1973fc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 14:07:26 +06:30
Aung Myo
a0e16bd485 update crm and bill 2017-07-02 14:06:21 +06:30
Phyo
a86ac10e83 Zone OQS bug fix 2017-07-02 13:39:36 +06:30
Aung Myo
09370a2a78 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 12:08:09 +06:30
Aung Myo
b78119f848 update print 2017-07-02 11:41:47 +06:30
Nweni
acca5b5a1d Update 2017-07-02 11:22:49 +06:30
Aung Myo
df553dd489 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-02 09:38:01 +06:30
Aung Myo
78adf564e1 crong job and close cashier 2017-07-02 09:37:19 +06:30
Yan
97c70fb72b merge with crm 2017-07-01 20:11:52 +06:30