Yan
|
09f9a29cde
|
merge with master
|
2017-06-12 10:01:36 +06:30 |
|
Nweni
|
5ee3ae257a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 09:20:50 +06:30 |
|
Nweni
|
3f3d37756d
|
update
|
2017-06-12 09:20:38 +06:30 |
|
Min Zeya Phyo
|
7eaea8f08d
|
fixed jsonb to json to support both mysql and postgres
|
2017-06-12 07:40:40 +06:30 |
|
Min Zeya Phyo
|
a2fcd0c44e
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# Gemfile.lock
|
2017-06-12 07:34:05 +06:30 |
|
Min Zeya Phyo
|
137267514b
|
bundle gemlock
|
2017-06-12 07:21:09 +06:30 |
|
Yan
|
f834911587
|
to do req_bill_format and status changed after pay
|
2017-06-12 00:45:26 +06:30 |
|
Nweni
|
6d4ef8e2ad
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-11 17:49:17 +06:30 |
|
Nweni
|
fc3893f048
|
payment
|
2017-06-11 17:49:06 +06:30 |
|
Moe Su
|
7ac89829d1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-11 17:40:53 +06:30 |
|
Moe Su
|
7341657477
|
redeem process
|
2017-06-11 17:40:44 +06:30 |
|
Nweni
|
f6d14de461
|
fixed conflict
|
2017-06-11 16:58:18 +06:30 |
|
Nweni
|
05286ce7a6
|
payment
|
2017-06-11 16:57:31 +06:30 |
|
Moe Su
|
60b1819220
|
Generating seed
|
2017-06-11 16:47:22 +06:30 |
|
Moe Su
|
fe2a07bf5f
|
Redeem process
|
2017-06-11 16:17:50 +06:30 |
|
Moe Su
|
ee197dba05
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-11 16:12:23 +06:30 |
|
Moe Su
|
29cdcfb28d
|
For Pull
|
2017-06-11 16:11:44 +06:30 |
|
Nweni
|
a809818324
|
other payment
|
2017-06-11 16:10:50 +06:30 |
|
Nweni
|
31cc75462b
|
fixed conflict
|
2017-06-11 15:52:13 +06:30 |
|
Nweni
|
b7bd68a461
|
payment keypad
|
2017-06-11 15:51:22 +06:30 |
|
Moe Su
|
0e7ed4bc1a
|
edit membership setting , otherpayment page
|
2017-06-11 15:50:31 +06:30 |
|
Moe Su
|
33cc576f1e
|
edit membership setting , otherpayment page
|
2017-06-11 15:48:53 +06:30 |
|
Moe Su
|
596c16d274
|
edit redeem
|
2017-06-11 14:09:19 +06:30 |
|
Moe Su
|
1d24099abc
|
For Pull
|
2017-06-11 13:58:34 +06:30 |
|
Moe Su
|
d49dc3f8c8
|
change route
|
2017-06-11 13:55:14 +06:30 |
|
Nweni
|
7ab9874b80
|
remove migration files
|
2017-06-11 13:20:26 +06:30 |
|
Nweni
|
aa8068ad10
|
Update
|
2017-06-11 13:02:03 +06:30 |
|
Moe Su
|
9f9c83ab7f
|
pay par payment
|
2017-06-11 13:01:03 +06:30 |
|
Yan
|
518e15f5d1
|
update crm
|
2017-06-09 13:54:39 +06:30 |
|
Nweni
|
82de95ca22
|
update
|
2017-06-09 13:52:36 +06:30 |
|
Yan
|
4c29aad299
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-09 13:47:19 +06:30 |
|
Yan
|
a100d742e6
|
add crm order printer in seed
|
2017-06-09 13:47:00 +06:30 |
|
Yan
|
0b04e2d4ef
|
add base report controller
|
2017-06-09 13:35:41 +06:30 |
|
Yan
|
d2373f2f24
|
origami updating
|
2017-06-09 13:35:15 +06:30 |
|
Nweni
|
8b99f4844e
|
bill api return updated
|
2017-06-09 13:33:12 +06:30 |
|
Aung Myo
|
9c228dce5c
|
update view crm
|
2017-06-09 13:26:47 +06:30 |
|
Aung Myo
|
5d89713bb6
|
crm print update
|
2017-06-09 13:24:20 +06:30 |
|
Nweni
|
9dd96c7187
|
fixed conflict
|
2017-06-09 13:13:54 +06:30 |
|
Nweni
|
56ffd1f063
|
update sale order talble
|
2017-06-09 13:13:20 +06:30 |
|
Aung Myo
|
406172c6ff
|
fixed conflict
|
2017-06-09 12:04:36 +06:30 |
|
Aung Myo
|
ba9ebe12de
|
update customer
|
2017-06-09 12:00:46 +06:30 |
|
Yan
|
e7a1687b85
|
update top menu bar for report
|
2017-06-09 11:59:08 +06:30 |
|
Yan
|
e969249e48
|
Merge branch 'report'
|
2017-06-09 11:57:15 +06:30 |
|
Yan
|
367a8694b1
|
update payment
|
2017-06-09 11:57:05 +06:30 |
|
Aung Myo
|
e2e8045d0f
|
update crm layout
|
2017-06-09 11:55:50 +06:30 |
|
Yan
|
fe60ac818f
|
update assets
|
2017-06-09 11:33:21 +06:30 |
|
Nweni
|
6171b00dc7
|
cash payment complete
|
2017-06-09 11:25:30 +06:30 |
|
Yan
|
9771ed2019
|
add report in menu
|
2017-06-09 11:03:14 +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 |
|