Commit Graph

1241 Commits

Author SHA1 Message Date
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Yan
5a5e654dbc move css to css file 2017-08-14 15:26:04 +06:30
Yan
739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:40:43 +06:30
Yan
0df8264de7 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:38:14 +06:30
Yan
74d7adbaef deving item sets 2017-08-14 14:27:37 +06:30
Phyo
497a1b60f7 add Updated_at to Employee Listing 2017-08-14 14:04:39 +06:30
Aung Myo
069ad16733 update oqs filtring 2017-08-14 13:42:47 +06:30
Phyo
a870423e7d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 13:42:10 +06:30
Phyo
25ab7c9701 Payment Voucher UI fix 2017-08-14 13:41:18 +06:30
Nweni
1f892fdd3d fixed conflict 2017-08-14 11:32:18 +06:30
Nweni
6f39a024ca dining charge 2017-08-14 11:30:58 +06:30
Yan
f8c7630b97 updating item_set 2017-08-14 10:28:23 +06:30
Phyo
5c2928166d Voucher/Cuopon UI phrase 1 2017-08-11 18:10:57 +06:30
Phyo
740038757d Dining Charges CRUD 2017-08-11 17:53:48 +06:30
Yan
a614ec6ae7 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-11 17:41:28 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Aung Myo
10aae022d2 update oqs 2017-08-11 16:47:57 +06:30
Aung Myo
79ca1428b9 update close receipt for member discount 2017-08-11 15:39:08 +06:30
Yan
be71d187b0 update menu 2017-08-11 15:00:24 +06:30
yamin
2cad08277e Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-11 14:42:59 +06:30
yamin
3e6ea657f3 Set Footer in Dashboard 2017-08-11 14:42:44 +06:30
Yan
12d3e70b19 update model for menu 2017-08-11 14:23:33 +06:30
Yan
b7cde3125f add item set and relation 2017-08-11 13:44:25 +06:30
Yan
b7c49f5f60 remove item set migrateion 2017-08-11 13:34:58 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
2c7a641d47 update oqs 2017-08-11 13:21:40 +06:30
Yan
fbd5e70f2b Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-11 12:16:07 +06:30
Yan
ed793bd48c remove puts in sale 2017-08-11 12:15:47 +06:30
Aung Myo
5684d5d0c7 update oqs 2017-08-11 12:15:30 +06:30
Yan
0e93eb3765 fix for customer tax ui and calc tax after bind customer 2017-08-11 12:13:30 +06:30
Yan
b0f2bbe899 add pivot table for menu 2017-08-11 11:28:13 +06:30
Yan
2000eb2d6c add pivot table for menu 2017-08-11 11:27:53 +06:30
Aung Myo
9eaf04778c update oqs 2017-08-11 10:25:09 +06:30
Yan
5ffb715bd1 add menu_item_set 2017-08-10 18:47:29 +06:30
Yan
d32fbf18e0 update oqs 2017-08-10 18:45:59 +06:30
Yan
a368c4b0b6 date convert oqs 2017-08-10 18:25:10 +06:30
Yan
7a78533e2c Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-10 18:20:25 +06:30
Aung Myo
362789a93e update oqs 2017-08-10 18:19:07 +06:30
Yan
338c420850 update fix for customer 2017-08-10 18:02:50 +06:30
Yan
99946deea3 update fix for customer 2017-08-10 18:01:37 +06:30
Yan
3e0eebfa88 nothing change before 2017-08-10 16:24:56 +06:30
Yan
1dbd6eb60a inclusive tax calc by rake 2017-08-10 14:59:16 +06:30
Aung Myo
4501762300 start for oqs 2017-08-10 14:50:47 +06:30
Yan
edf213d6d6 fix for tax inclusive 2017-08-10 14:49:00 +06:30
Yan
02c71f1961 no change but edit line space in bill pdf 2017-08-10 14:15:20 +06:30
Yan
c522ba3cab merge with staging 2017-08-10 13:42:08 +06:30
Yan
ce8a5ce21e fixed for customer tax 2017-08-10 13:38:58 +06:30
Yan
fb8c67f058 fix for customer tax 2017-08-10 13:38:39 +06:30
Aung Myo
321c65d70b update view 2017-08-10 13:37:31 +06:30
Aung Myo
80d13ce1f9 finished sale summary quick view 2017-08-10 11:59:15 +06:30