Commit Graph

304 Commits

Author SHA1 Message Date
Zin Lin Phyo
3132bc7c34 commission update 2017-08-23 11:14:24 +06:30
Zin Lin Phyo
fd1bfb7c0e load commissioner 2017-08-23 10:24:26 +06:30
Zin Lin Phyo
74c2955ef0 create productCommission 2017-08-22 11:08:49 +06:30
Zin Lin Phyo
1af178fecb update ui commission & commissioner 2017-08-22 09:51:08 +06:30
yamin
4e29cd7cdd CRUDcommission 2017-08-21 18:14:36 +06:30
yamin
9d424df9fd updateCommissioner 2017-08-21 17:31:17 +06:30
yamin
b7f9d56221 fix conflit 2017-08-21 16:35:15 +06:30
Zin Lin Phyo
f26bc83b42 move commission to origami 2017-08-21 16:31:04 +06:30
yamin
dc95f78202 Merge branch 'master' into august_spring 2017-08-21 10:12:47 +06:30
Phyo
8caf4b2612 Coupon / Voucher data change 2017-08-21 10:09:23 +06:30
Aung Myo
865c2c5cdd update add order 2017-08-17 09:54:19 +06:30
Yan
20bba0f659 merge with august_spring 2017-08-15 17:04:28 +06:30
Aung Myo
e4a2d58e5e update foc and pdf 2017-08-15 15:14:55 +06:30
Zin Lin Phyo
74b15465f7 item foc in sale edit 2017-08-15 15:13:44 +06:30
Aung Myo
d5f6bca2b8 Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-14 15:35:44 +06:30
Aung Myo
67b6da92ab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-14 15:04:28 +06:30
Aung Myo
a691eb8d64 update 2017-08-14 15:01:44 +06:30
Yan
739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:40:43 +06:30
Phyo
25ab7c9701 Payment Voucher UI fix 2017-08-14 13:41:18 +06:30
Phyo
5c2928166d Voucher/Cuopon UI phrase 1 2017-08-11 18:10:57 +06:30
Yan
a614ec6ae7 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-11 17:41:28 +06:30
Aung Myo
79ca1428b9 update close receipt for member discount 2017-08-11 15:39:08 +06:30
Yan
0e93eb3765 fix for customer tax ui and calc tax after bind customer 2017-08-11 12:13:30 +06:30
Yan
c522ba3cab merge with staging 2017-08-10 13:42:08 +06:30
Aung Myo
80d13ce1f9 finished sale summary quick view 2017-08-10 11:59:15 +06:30
Yan
2794103e52 update customer tax calc 2017-08-09 17:54:22 +06:30
Aung Myo
13359cecba update void for bitp 2017-08-09 13:57:52 +06:30
Aung Myo
729daeba7b update filter order 2017-08-09 11:54:19 +06:30
Aung Myo
644b94764e update closing receipt 2017-08-08 18:03:02 +06:30
Aung Myo
e71ca0dee8 update room 2017-08-03 13:31:52 +06:30
Aung Myo
518314c772 update room in origami 2017-08-03 12:05:54 +06:30
Aung Myo
39a314bc9a update rome check all fun 2017-08-03 11:22:23 +06:30
Aung Myo
3bbf60b3ef update total tax when other charges 2017-08-02 17:31:43 +06:30
Aung Myo
6a6b7eae29 update total tax when other charges 2017-08-02 16:58:34 +06:30
Yan
23faf65af6 add shift id after req bill 2017-08-01 18:41:53 +06:30
Yan
60089a3879 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-31 13:15:23 +06:30
Aung Myo
98c04f21d8 update report and view 2017-07-28 17:07:16 +06:30
Yan
bf3e30c70f control for member create and member discount 2017-07-27 18:53:41 +06:30
Aung Myo
1de6cc906c update rounding adj for osaka 2017-07-26 16:35:34 +06:30
Aung Myo
83b8d72632 update add order 2017-07-26 15:04:35 +06:30
Aung Myo
c93b50d46a update conflict oragimi.scss 2017-07-26 10:04:49 +06:30
Aung Myo
cbe6803cf9 update cancelall void and receipt,item report for today 2017-07-25 16:55:36 +06:30
Yan
09193a532a fix sale edit cntr 2017-07-25 16:30:52 +06:30
Yan
bf9b977cd0 membership update 2017-07-24 19:24:43 +06:30
Yan
8db4a8cc05 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-21 18:15:39 +06:30
Yan
b8fc67745d fix discount and receipt bill 2017-07-21 18:15:10 +06:30
Aung Myo
8852bc0449 update pay without existing invoice in salepayment.rb 2017-07-21 17:52:38 +06:30
Aung Myo
c5dbbea76d update long bill 2017-07-21 17:07:31 +06:30
Yan
2e8c866761 osaka menu update and void tax calc fix 2017-07-21 14:56:40 +06:30
Yan
13e274eefb Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-21 10:53:16 +06:30