Yan
|
b528da3d9b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-06-05 13:29:01 +06:30 |
|
Yan
|
1dbe133b79
|
update for db changed
|
2017-06-05 13:28:40 +06:30 |
|
Yan
|
c4e6f917f4
|
modified in order model
|
2017-06-05 10:22:12 +06:30 |
|
PhyoTheingi
|
42ba2d9ae4
|
comment the conflict in creating menu item instances with account and item attribute validate
|
2017-06-05 10:00:32 +06:30 |
|
Yan
|
9b90e3bd7e
|
pulled master at 4
|
2017-06-04 18:29:58 +06:30 |
|
Yan
|
8d4086d5e9
|
oqs printing
|
2017-06-04 18:25:09 +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
|
ad44d9d0e3
|
move login_from from model folder to form folder
|
2017-06-04 16:28:29 +06:30 |
|
Min Zeya Phyo
|
4fc511d531
|
custom primary key for transaction
|
2017-06-04 16:27:14 +06:30 |
|
Nweni
|
db904739ac
|
setting update
|
2017-06-04 15:55:06 +06:30 |
|
Nweni
|
9624d4df3e
|
update
|
2017-06-04 15:47:03 +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
|
69d188d4c1
|
..
|
2017-06-04 15:28:48 +06:30 |
|
Nweni
|
f5b6445a21
|
update
|
2017-06-04 14:46:00 +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
|
fa34d1db8f
|
fixed conflict
|
2017-06-04 10:23:38 +06:30 |
|
Nweni
|
3161c87a95
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend
|
2017-06-04 10:21:54 +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
|
394d2ed938
|
change transactional primary key to custom ID for better portability
|
2017-06-03 19:12:35 +06:30 |
|
PhyoTheingi
|
a01c4bd9cf
|
Menu Item instances and OQS json saving
|
2017-06-03 17:09:56 +06:30 |
|
Aung Myo
|
a2c9996b76
|
Finished Request Bill print function
|
2017-06-03 17:04:17 +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
|
eab356233c
|
add new model - shop - it will be use to define what is setup
|
2017-06-03 15:04:53 +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
|
aa36c679ab
|
oqs item count fixed
|
2017-06-03 13:25:23 +06:30 |
|
Yan
|
03ae60d2e6
|
merge all 03062017
|
2017-06-03 12:50:08 +06:30 |
|
Min Zeya Phyo
|
4dbf52d5a4
|
remove ignore for gemfile and gemfile.lock, re-add mysql2
|
2017-06-03 12:48:05 +06:30 |
|
Yan
|
2e2bda168c
|
print developing
|
2017-06-03 12:41:24 +06:30 |
|
PhyoTheingi
|
2716b913f2
|
Setting Instances Update
|
2017-06-03 11:59:29 +06:30 |
|
Aung Myo
|
2374fedca5
|
account show.html
|
2017-06-03 10:37:05 +06:30 |
|
Aung Myo
|
030d3ffb0f
|
confict clear
|
2017-06-02 19:22:01 +06:30 |
|
Aung Myo
|
01fefe3b79
|
account working
|
2017-06-02 19:16:14 +06:30 |
|
Yan
|
ea082f0d43
|
creating order queue printer
|
2017-06-02 19:01:28 +06:30 |
|
Yan
|
90ca4651aa
|
add print controller
|
2017-06-02 18:50:21 +06:30 |
|
Yan
|
3d05a91adf
|
Print ui update
|
2017-06-02 18:49:44 +06:30 |
|
Yan
|
63be238e09
|
uncomplete print, need for print_settings
|
2017-06-02 18:26:44 +06:30 |
|
Cherry
|
7146a1028a
|
update
|
2017-06-02 17:53:25 +06:30 |
|
Cherry
|
9afe39b7e2
|
commit for sales
|
2017-06-02 17:48:03 +06:30 |
|
Yan
|
6d705e2860
|
merge with master
|
2017-06-02 16:52:58 +06:30 |
|
Yan
|
022a2e005f
|
initial print setup
|
2017-06-02 16:22:15 +06:30 |
|
Yan
|
98a7c31ffa
|
initial setup for print
|
2017-06-02 16:21:47 +06:30 |
|