Commit Graph

236 Commits

Author SHA1 Message Date
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
yamin
81c928b375 InJutyUpdate 2017-08-28 17:55:47 +06:30
Zin Lin Phyo
36b4b15688 added commission report 2017-08-28 10:52:14 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Nweni
c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df inventory development 2017-08-28 09:37:36 +06:30
Zin Lin Phyo
ef9fe32b5b fix conflit 2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9 commission in sale edit 2017-08-25 13:44:22 +06:30
yamin
29a5062b85 InJutiesUpdate 2017-08-25 13:06:25 +06:30
Nweni
6aaea69f0a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 09:41:44 +06:30
Nweni
b99c503afa inventory 2017-08-25 09:40:59 +06:30
yamin
4791656a7d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:26:28 +06:30
yamin
7004637027 In_juties 2017-08-24 18:24:57 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Zin Lin Phyo
874a9b60be create InJuty 2017-08-23 15:02:27 +06:30
Zin Lin Phyo
fd1bfb7c0e load commissioner 2017-08-23 10:24:26 +06:30
Phyo
e3c1dd216a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-21 17:40:44 +06:30
Phyo
e9ba56826c Promotion Product Add 2017-08-21 17:38:07 +06:30
yamin
b7f9d56221 fix conflit 2017-08-21 16:35:15 +06:30
yamin
8c6f06a667 for pull 2017-08-21 16:33:59 +06:30
Zin Lin Phyo
f26bc83b42 move commission to origami 2017-08-21 16:31:04 +06:30
yamin
25e6039a9f CRUDcommissioner 2017-08-21 16:12:59 +06:30
Zin Lin Phyo
e4e2c306a4 commssion scaffold 2017-08-21 16:11: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
Yan
3160aab399 merge with addorder 2017-08-17 18:59:22 +06:30
Yan
29b3f94573 add menu api 2017-08-17 18:55:13 +06:30
Yan
f2829fab0f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-17 13:50:24 +06:30
Aung Myo
865c2c5cdd update add order 2017-08-17 09:54:19 +06:30
yamin
4fc748e877 CRUDforProducts 2017-08-16 18:19:20 +06:30
Phyo
73cceaf482 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-16 11:00:51 +06:30
Phyo
db43ae186c DB for promtion, promotion product,product 2017-08-16 11:00:37 +06:30
Yan
20bba0f659 merge with august_spring 2017-08-15 17:04:28 +06:30
Aung Myo
e4a2d58e5e update foc and pdf 2017-08-15 15:14:55 +06:30
Zin Lin Phyo
74b15465f7 item foc in sale edit 2017-08-15 15:13:44 +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
Phyo
25ab7c9701 Payment Voucher UI fix 2017-08-14 13:41:18 +06:30
Phyo
740038757d Dining Charges CRUD 2017-08-11 17:53:48 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
362789a93e update oqs 2017-08-10 18:19:07 +06:30
Yan
60089a3879 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-31 13:15:23 +06:30
Aung Myo
98c04f21d8 update report and view 2017-07-28 17:07:16 +06:30