Aung Myo
|
d65882ac5b
|
crm update
|
2017-06-11 18:00:34 +06:30 |
|
Yan
|
71e09ef452
|
comment for cable and add print seed
|
2017-06-08 18:57:53 +06:30 |
|
Yan
|
4d4c40cc17
|
a little change for setup
|
2017-06-08 09:48:24 +06:30 |
|
Yan
|
f746c18238
|
(important)migrateion files changed
|
2017-06-07 18:47:50 +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 |
|
Yan
|
114c4ee14d
|
all changed for index in origami
|
2017-06-07 17:13:27 +06:30 |
|
Nweni
|
b847cde62c
|
sale query updated
|
2017-06-06 14:03:21 +06:30 |
|
Yan
|
dcb8217824
|
updated order.rb for order_items_id
|
2017-06-06 10:32:38 +06:30 |
|
Yan
|
e66dd33c1a
|
updated order.rb
|
2017-06-06 10:27:59 +06:30 |
|
Aung Myo
|
324f1e3b24
|
update query in order model for origami
|
2017-06-06 10:10:47 +06:30 |
|
Nweni
|
eaec6a39b4
|
fixed conflict
|
2017-06-06 09:47:33 +06:30 |
|
Nweni
|
0cc378f318
|
fixed conflict
|
2017-06-06 09:43:16 +06:30 |
|
Yan
|
b24e667e9e
|
merged crm
|
2017-06-06 09:41:06 +06:30 |
|
Aung Myo
|
b54a19cfff
|
update query data for origami
|
2017-06-06 09:18:01 +06:30 |
|
Yan
|
f1877408be
|
fixed for pm key changed
|
2017-06-05 18:52:19 +06:30 |
|
Nweni
|
faca7295f7
|
added new image upload file
|
2017-06-05 17:14:07 +06:30 |
|
Aung Myo
|
68e51c98c3
|
update origamitable,room query
|
2017-06-05 15:07:44 +06:30 |
|
Yan
|
f004db9b19
|
updated migration code
|
2017-06-05 15:06:34 +06:30 |
|
Yan
|
c4e6f917f4
|
modified in order model
|
2017-06-05 10:22:12 +06:30 |
|
Aung Myo
|
e309b35669
|
fixed conflictsale item order order item
|
2017-06-04 16:51:38 +06:30 |
|
Min Zeya Phyo
|
eb74eb2a2d
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# app/models/order_item.rb
|
2017-06-04 16:37:13 +06:30 |
|
Min Zeya Phyo
|
4fc511d531
|
custom primary key for transaction
|
2017-06-04 16:27:14 +06:30 |
|
Aung Myo
|
af02a63263
|
fixed conflict request_bill and order model
|
2017-06-04 16:25:25 +06:30 |
|
Cherry
|
e3f9d62bce
|
Sale Save
|
2017-06-04 16:02:55 +06:30 |
|
Nweni
|
aa295c3a12
|
fixed conflict
|
2017-06-04 13:12:02 +06:30 |
|
Nweni
|
e5e14aaa62
|
fixed conflict
|
2017-06-04 10:19:35 +06:30 |
|
Nweni
|
3ab3fa71a8
|
fixed conflict
|
2017-06-04 10:16:23 +06:30 |
|
Nweni
|
e3e41bd64e
|
Update
|
2017-06-04 10:12:33 +06:30 |
|
Min Zeya Phyo
|
9dddd2fc78
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-06-03 15:05:25 +06:30 |
|
Min Zeya Phyo
|
bf8679c201
|
Merge branch 'shop_setup'
|
2017-06-03 14:26:45 +06:30 |
|
Aung Myo
|
138850fb24
|
origin pull master
|
2017-06-03 13:44:10 +06:30 |
|
Aung Myo
|
7529d23147
|
update booking status and view
|
2017-06-03 13:32:13 +06:30 |
|
Yan
|
622ca05c9e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-03 13:27:11 +06:30 |
|
Yan
|
03ae60d2e6
|
merge all 03062017
|
2017-06-03 12:50:08 +06:30 |
|
Cherry
|
9afe39b7e2
|
commit for sales
|
2017-06-02 17:48:03 +06:30 |
|
Nweni
|
a9259ca845
|
order
|
2017-06-02 11:30:10 +06:30 |
|
Yan
|
2a323c8d0d
|
deleted order queue item
|
2017-06-01 12:07:27 +06:30 |
|
Yan
|
6b2a496830
|
merged origami
|
2017-06-01 10:08:55 +06:30 |
|
Cherry
|
47469cf466
|
Origami update commit
|
2017-06-01 09:27:37 +06:30 |
|
Min Zeya Phyo
|
516b854fba
|
shop_setup branch
|
2017-05-30 23:46:22 +08:00 |
|
Yan
|
e46fe1ec7c
|
add cable but not complete
|
2017-05-30 19:02:40 +06:30 |
|
Min Zeya Phyo
|
f860954a7f
|
final format
|
2017-04-21 23:46:38 +06:30 |
|
Min Zeya Phyo
|
c4e76c53b2
|
emenu api integrated
|
2017-04-19 18:37:07 +06:30 |
|
Min Zeya Phyo
|
6a84a34a9f
|
sale receipt generation and bill api
|
2017-04-17 13:09:54 +06:30 |
|
Min Zeya Phyo
|
30774b4efd
|
order submission and order queue submission basic done
|
2017-04-16 16:52:04 +06:30 |
|
Min Zeya Phyo
|
7cc2ac395d
|
order queue processing
|
2017-04-14 15:50:17 +06:30 |
|
Min Zeya Phyo
|
5b1bb6f6cd
|
sales and orders methods updates
|
2017-04-11 13:51:09 +08:00 |
|
Min Zeya Phyo
|
0ddc7bdb44
|
basic layout template
|
2017-04-05 08:24:21 +06:30 |
|
Min Zeya Phyo
|
bcdce092cc
|
order api - WIP & db structure change
|
2017-04-04 12:18:17 +06:30 |
|