Commit Graph

1199 Commits

Author SHA1 Message Date
Phyo
db43ae186c DB for promtion, promotion product,product 2017-08-16 11:00:37 +06:30
yamin
0ec1657f7b Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 16:50:19 +06:30
yamin
5fc485615c UpdateDiningCharges 2017-08-14 16:49:39 +06:30
Zin Lin Phyo
a01eaacbcb fix conflit 2017-08-14 16:46:26 +06:30
Zin Lin Phyo
7dae1c2c27 dashboard link 2017-08-14 16:43:35 +06:30
Phyo
624617fc02 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 15:33:28 +06:30
Phyo
af3a7c1d88 Room Charges Bug Fix 2017-08-14 15:33:13 +06:30
yamin
26e5472abc xMerge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 14:29:24 +06:30
yamin
3c54f4da89 addQueryforwidthandheight 2017-08-14 14:29:03 +06:30
yamin
fa68bcff69 removeDBcolsanddbparams 2017-08-14 14:26:16 +06:30
Phyo
497a1b60f7 add Updated_at to Employee Listing 2017-08-14 14:04:39 +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
yamin
c30d8f15d8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 10:19:22 +06:30
yamin
646492fbd6 updateability 2017-08-14 10:18:59 +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
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
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Phyo
14384745ad Payment Methods - Isactive verification 2017-08-09 15:37:28 +06:30
yamin
1b14589927 addCreatedAtInEmployee 2017-08-09 15:25:16 +06:30
yamin
a03e38179f UpdateHrLine 2017-08-09 15:23:55 +06:30
yamin
813abe1733 Regrouping Nav bar 2017-08-09 12:30:11 +06:30
yamin
7ce5ec93e4 Change title for Cashin/Cashout 2017-08-09 12:29:27 +06:30
yamin
da690e00b8 add s in Points 2017-08-09 12:28:46 +06:30
yamin
38a0f78731 add Product to account 2017-08-09 12:28:17 +06:30
Phyo
fe8e246898 Remove BreadCrumb on CRM 2017-08-08 18:12:50 +06:30
Phyo
a83b2c3acd CRM - Queue fix scroll 2017-08-08 17:55:03 +06:30
Phyo
1e38903d6d CRM - Queue 2017-08-08 17:51:03 +06:30
Yan
f46d786859 update crm 2017-08-08 14:29:48 +06:30
Yan
5ed4a7f51a rails updated 2017-08-08 11:48:50 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
35d1ec59cb update payment show 2017-08-04 18:29:45 +06:30
Aung Myo
02020e25c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-04 15:25:49 +06:30
Aung Myo
a4d2fc53b0 update 2017-08-04 15:25:19 +06:30
Aung Myo
e71ca0dee8 update room 2017-08-03 13:31:52 +06:30
Yan
a0b21118d5 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-03 12:10:51 +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
Yan
e0422328b6 dump 2017-08-02 18:38:03 +06:30
Yan
16678b438b dump 2017-08-02 18:37:18 +06:30
Yan
ae5299bbe1 dump 2017-08-02 17:32: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
266f60d2cb dump 2017-08-02 15:15:05 +06:30
Yan
c096e82148 update shop in seed for osaka 2017-08-02 14:33:03 +06:30
Yan
da5dfa1853 void sale report update 2017-08-02 12:19:18 +06:30