Commit Graph

254 Commits

Author SHA1 Message Date
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +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
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +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
Zin Lin Phyo
d6b8e8bdee update commissioner 2017-08-23 11:36:36 +06:30
Zin Lin Phyo
3132bc7c34 commission update 2017-08-23 11:14:24 +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
d4d8961b87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder 2017-08-17 09:54:55 +06:30
Aung Myo
865c2c5cdd update add order 2017-08-17 09:54:19 +06:30
Yan
0eee1fd0af menu ui update 2017-08-16 18:26:30 +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
ac47d7d8f0 update dashbiard ui 2017-08-14 15:57:34 +06:30
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Yan
5a5e654dbc move css to css file 2017-08-14 15:26:04 +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
Aung Myo
362789a93e update oqs 2017-08-10 18:19:07 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
50a878349d update add order 2017-07-26 15:08:44 +06:30
Aung Myo
c93b50d46a update conflict oragimi.scss 2017-07-26 10:04:49 +06:30
Aung Myo
a7cbea5dbb update login To show dashboard screen with available features based on user type 2017-07-24 17:42:34 +06:30
Yan
c068d702b3 still nfc 2017-07-18 11:52:49 +06:30
Yan
df06b81b28 Merge branch 'staging' 2017-07-17 15:13:31 +06:30
Yan
51c14f379b still nfc 2017-07-17 15:07:27 +06:30
Yan
b2ccc12e17 add paypar acc for nfc 2017-07-16 18:16:52 +06:30
Aung Myo
0b7b5cae30 update osaka demo bugs 2017-07-14 17:23:40 +06:30
Yan
6f57bb8a79 adding shift sale summary 2017-07-13 11:12:02 +06:30
Aung Myo
2d55ea0dab update add order 2017-07-07 09:56:18 +06:30
Aung Myo
040d60402b update edit qty and price and cash and credit div in payment details 2017-07-06 12:54:04 +06:30
Aung Myo
7cee40746d update unsuccessfully rebate and alert 2017-07-05 14:42:40 +06:30
Yan
d51b1a0b9e disable cable and oqs qty can 0 2017-07-04 18:56:52 +06:30