Commit Graph

207 Commits

Author SHA1 Message Date
Aung Myo
bbcce13a2e update addorder 2017-09-13 09:21:35 +06:30
Yan
c3b38a860c bill cable add and add ... for origami pages 2017-09-11 16:37:50 +06:30
Yan
3e76509347 remove console log 2017-09-07 18:06:59 +06:30
Yan
f67d4197ec add bill channel for req bill 2017-09-07 15:35:00 +06:30
Aung Myo
a9d31935a1 update addorder bugs 2017-09-06 13:22:46 +06:30
Aung Myo
d1db57e9b5 update oqs action cable sorting 2017-09-05 18:06:57 +06:30
Aung Myo
bb6e938f47 update oqs action cable for order cahnnel and oqs channel 2017-09-05 16:51:41 +06:30
Aung Myo
4a85039170 update oqs action cable for order cahnnel and oqs channel 2017-09-05 14:07:20 +06:30
Aung Myo
eeb2a91ce9 update oqs action cable for order cahnnel and oqs channel 2017-09-05 09:41:05 +06:30
Aung Myo
fc5192157b update 2017-09-01 16:55:51 +06:30
Yan
2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 12:10:31 +06:30
Aung Myo
449969fa5b update addorder 2017-08-31 11:22:12 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
3e8ead6a32 ui code review and edited 2017-08-30 19:04:06 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Yan
bbd9a50868 merge with august spring 2017-08-28 18:33:49 +06:30
Yan
6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
Nweni
1f7ba42e80 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30
Nweni
44f02be4cb nested form 2017-08-22 14:11:13 +06:30
yamin
8c6f06a667 for pull 2017-08-21 16:33:59 +06:30
Zin Lin Phyo
618f5f3b7c commssions 2017-08-21 16:11:51 +06:30
yamin
3b5eb532d3 updateProduct 2017-08-21 16:06:34 +06:30
Zin Lin Phyo
2a736cc92f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
  Update
  Coupon / Voucher data change
  update menu_sync
  update addorder
  update addorder view
  add fields for Menu Sync
  update add oreder
  add menu api
  update add order and calculate subtotal
  update seed
  menu ui update
  update ability for setmenu
  fixed
  update show for foc
  add bootstrap file input and menu item img implemented
  update foc and pdf
  update menu item
  update receipt bill pdf for foc and credit
  add CarrierWave gems for menu image upload
  add CarrierWave gems for menu image upload
  ...
2017-08-21 13:30:28 +06:30
Zin Lin Phyo
7b0db433c4 commissioner scaffold 2017-08-21 13:30:04 +06:30
Aung Myo
865c2c5cdd update add order 2017-08-17 09:54:19 +06:30
Yan
e0789ecb97 Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant 2017-08-15 17:24:46 +06:30
Yan
513530e8f3 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-15 16:42:32 +06:30
Yan
e69eeadb6e add bootstrap file input and menu item img implemented 2017-08-15 16:27:40 +06:30
Aung Myo
997cc0733c add item set and menu item set CRUD 2017-08-14 17:57:55 +06:30
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Yan
739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:40:43 +06:30
Aung Myo
069ad16733 update oqs filtring 2017-08-14 13:42:47 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Aung Myo
10aae022d2 update oqs 2017-08-11 16:47:57 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
2c7a641d47 update oqs 2017-08-11 13:21:40 +06:30
Aung Myo
5684d5d0c7 update oqs 2017-08-11 12:15:30 +06:30
Aung Myo
9eaf04778c update oqs 2017-08-11 10:25:09 +06:30