Commit Graph

75 Commits

Author SHA1 Message Date
Phyo
e9ba56826c Promotion Product Add 2017-08-21 17:38:07 +06:30
Yan
5ed4a7f51a rails updated 2017-08-08 11:48:50 +06:30
Aung Myo
78adf564e1 crong job and close cashier 2017-07-02 09:37:19 +06:30
Zin Lin Phyo
5489da2066 route conflit fix 2017-06-26 18:02:08 +06:30
Zin Lin Phyo
feb1d66257 overall void 2017-06-26 18:00:48 +06:30
Nweni
0c0e44c808 move table 2017-06-22 16:31:41 +06:30
Yan
bded56a696 customer seed updated 2017-06-22 10:11:50 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Yan
5cfcc9ab6a fixed pagination 2017-06-14 20:01:34 +06:30
Yan
0eb8ac7087 fixing pagination 2017-06-14 19:54:11 +06:30
Yan
7e35850c69 comment nokogiri gem 2017-06-14 10:53:37 +06:30
Aung Myo
b513aa22ab datepicker 2017-06-13 12:27:45 +06:30
Aung Myo
f8df5147a4 fixed conflict file 2017-06-13 10:40:49 +06:30
Aung Myo
c05a64bae7 update customer amount 2017-06-13 10:36:40 +06:30
Nweni
6945449523 get update 2017-06-12 18:51:02 +06:30
Cherry
a247c142b8 ReceiptList Report Rough 2017-06-12 18:26:00 +06:30
Moe Su
b47c983886 Edit Redim 2017-06-12 18:18:24 +06:30
Aung Myo
5d89713bb6 crm print update 2017-06-09 13:24:20 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Yan
5c5c0dba33 update gem 2017-06-08 18:08:34 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Yan
e516e653d2 update menu_items migrate 2017-06-08 15:24:59 +06:30
Moe Su
b57e24c076 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 15:17:45 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Aung Myo
26598e2731 for origami view file 2017-06-08 14:57:01 +06:30
Aung Myo
8388192a81 delete view origami file 2017-06-08 14:46:35 +06:30
Aung Myo
387650656f commit gemlock 2017-06-08 13:57:56 +06:30
Aung Myo
e3dea08306 commit checkout 2017-06-08 13:54:05 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30
Yan
c7aac7c2b8 update gem 2017-06-08 10:51:30 +06:30
Aung Myo
f9c8dbc03e fixed conflict route and request bill 2017-06-07 22:21:42 +06:30
Aung Myo
234ef9bc15 change crm booking 2017-06-07 22:17:12 +06:30
Yan
f746c18238 (important)migrateion files changed 2017-06-07 18:47:50 +06:30
Moe Su
6cc2e29e30 For pull 2017-06-07 18:13:12 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Aung Myo
bd345dbc3f fixed conflict 2017-06-07 17:15:51 +06:30
Moe Su
5264f9cf14 Paypar payment 2017-06-07 17:14:22 +06:30
Aung Myo
d2ce74f648 bootstrap datepicker and customer save 2017-06-06 14:16:40 +06:30
Nweni
c2952c4600 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-06 11:08:51 +06:30
Nweni
c461cb94f2 fixed 2017-06-06 11:08:43 +06:30
Aung Myo
324f1e3b24 update query in order model for origami 2017-06-06 10:10:47 +06:30
Aung Myo
792001a5f3 fixed conflict gem and gemfile lock 2017-06-06 10:01:21 +06:30
Aung Myo
6ecf791673 update coutomer controller 2017-06-06 09:47:24 +06:30
Aung Myo
68e51c98c3 update origamitable,room query 2017-06-05 15:07:44 +06:30
Aung Myo
d058b1b1b8 fixed conflict gem 2017-06-04 16:42:18 +06:30
Aung Myo
a2c9996b76 Finished Request Bill print function 2017-06-03 17:04:17 +06:30
Aung Myo
138850fb24 origin pull master 2017-06-03 13:44:10 +06:30
Aung Myo
bd1414e07f Gemfile and gem lock 2017-06-03 10:59:46 +06:30