Yan
|
0eb8ac7087
|
fixing pagination
|
2017-06-14 19:54:11 +06:30 |
|
Yan
|
ff65f4f480
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-14 14:13:45 +06:30 |
|
Nweni
|
f7451a4675
|
update
|
2017-06-14 13:33:09 +06:30 |
|
Yan
|
7e35850c69
|
comment nokogiri gem
|
2017-06-14 10:53:37 +06:30 |
|
Yan
|
74350e2b73
|
nokogiri gem re-add
|
2017-06-14 10:38:57 +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
|
3bc3419243
|
fixed conflict
|
2017-06-12 18:52:12 +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
|
406172c6ff
|
fixed conflict
|
2017-06-09 12:04:36 +06:30 |
|
Nweni
|
35553217f5
|
fixed conflict
|
2017-06-09 10:58:40 +06:30 |
|
Nweni
|
56a6d84abe
|
Update
|
2017-06-09 10:57:16 +06:30 |
|
Aung Myo
|
35277ac000
|
queue and crm view updated
|
2017-06-09 09:29:25 +06:30 |
|
Moe Su
|
5f5e6470c7
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-09 02:40:48 +06:30 |
|
Moe Su
|
7702c50675
|
Add membership action
|
2017-06-09 02:23:16 +06:30 |
|
Yan
|
42a29296c7
|
update gem
|
2017-06-08 19:07:20 +06:30 |
|
Yan
|
43debf4b7e
|
merged with crm
|
2017-06-08 19:04:48 +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 |
|
Moe Su
|
664fe2f6e1
|
Adding Redeem at payment
|
2017-06-08 15:17:26 +06:30 |
|
Aung Myo
|
8388192a81
|
delete view origami file
|
2017-06-08 14:46:35 +06:30 |
|
Yan
|
c7aac7c2b8
|
update gem
|
2017-06-08 10:51:30 +06:30 |
|
Yan
|
612f037fe8
|
index ui for discount
|
2017-06-08 10:40:06 +06:30 |
|
Moe Su
|
26f2dce142
|
For Pull
|
2017-06-08 09:53:04 +06:30 |
|
Aung Myo
|
44382d284f
|
fixed conflict
|
2017-06-07 22:29:43 +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 |
|
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 |
|
Yan
|
be7d448c30
|
update gem file
|
2017-06-07 18:09:56 +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 |
|
Yan
|
c482318b1a
|
req bill bugs fixing
|
2017-06-06 16:37:42 +06:30 |
|
Aung Myo
|
8fd23bfd87
|
conflict file
|
2017-06-06 14:49:25 +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
|
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 |
|
Yan
|
9b90e3bd7e
|
pulled master at 4
|
2017-06-04 18:29:58 +06:30 |
|
Nweni
|
9bb7eb7f17
|
fixed
|
2017-06-04 15:36:38 +06:30 |
|
Nweni
|
dd2b0dc8b3
|
updated
|
2017-06-04 15:35:46 +06:30 |
|
Nweni
|
17c687b6f8
|
gemfile
|
2017-06-04 15:33:35 +06:30 |
|
Nweni
|
aa295c3a12
|
fixed conflict
|
2017-06-04 13:12:02 +06:30 |
|
Yan
|
869c574107
|
comment pg in gem
|
2017-06-04 11:34:59 +06:30 |
|
Nweni
|
89cbb59e7c
|
fixed conflcit
|
2017-06-04 10:33:24 +06:30 |
|
Nweni
|
e5e14aaa62
|
fixed conflict
|
2017-06-04 10:19:35 +06:30 |
|