git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 911b941793 fix member sync and menu json Yan 2017-08-23 13:43:31 +06:30
  • d6b8e8bdee update commissioner Zin Lin Phyo 2017-08-23 11:36:36 +06:30
  • 3132bc7c34 commission update Zin Lin Phyo 2017-08-23 11:14:24 +06:30
  • b53db9b08b Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-23 10:24:44 +06:30
  • fd1bfb7c0e load commissioner Zin Lin Phyo 2017-08-23 10:24:26 +06:30
  • 67cf713b90 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-23 10:13:06 +06:30
  • eedf6c39a1 promotion + merge with master Nweni 2017-08-23 10:12:41 +06:30
  • 28dab9d3e0 promotion Nweni 2017-08-23 09:48:15 +06:30
  • 94cc126969 fix for pdf print setting Yan 2017-08-22 18:02:16 +06:30
  • 0c89b09249 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder Aung Myo 2017-08-22 16:10:29 +06:30
  • ee869c9ded update add order Aung Myo 2017-08-22 16:08:48 +06:30
  • 744065d3e9 merge with august_spring Yan 2017-08-22 14:52:14 +06:30
  • 533cfdfe8d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-22 14:12:04 +06:30
  • c3e511c8ed fix menu edit Yan 2017-08-22 14:11:25 +06:30
  • 44f02be4cb nested form Nweni 2017-08-22 14:11:13 +06:30
  • a400bb5a0e remove extra menu image Yan 2017-08-22 11:44:31 +06:30
  • 74c2955ef0 create productCommission Zin Lin Phyo 2017-08-22 11:08:49 +06:30
  • 1af178fecb update ui commission & commissioner Zin Lin Phyo 2017-08-22 09:51:08 +06:30
  • 7a1668ca82 re-fixed for customer button Yan 2017-08-21 18:44:40 +06:30
  • ad628c6746 update addorder Aung Myo 2017-08-21 18:22:51 +06:30
  • 7d60ab1a95 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-21 18:17:00 +06:30
  • 4e29cd7cdd CRUDcommission yamin 2017-08-21 18:14:36 +06:30
  • 5a1c161771 Promotion Relation with PromotionProduct Phyo 2017-08-21 17:46:16 +06:30
  • e3c1dd216a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-21 17:40:44 +06:30
  • e9ba56826c Promotion Product Add Phyo 2017-08-21 17:38:07 +06:30
  • 9d424df9fd updateCommissioner yamin 2017-08-21 17:31:17 +06:30
  • 2b0dcd4ab9 update and fix Yan 2017-08-21 16:50:24 +06:30
  • b7f9d56221 fix conflit yamin 2017-08-21 16:35:15 +06:30
  • 8c6f06a667 for pull yamin 2017-08-21 16:33:59 +06:30
  • f26bc83b42 move commission to origami Zin Lin Phyo 2017-08-21 16:31:04 +06:30
  • 25e6039a9f CRUDcommissioner yamin 2017-08-21 16:12:59 +06:30
  • 618f5f3b7c commssions Zin Lin Phyo 2017-08-21 16:11:51 +06:30
  • e4e2c306a4 commssion scaffold Zin Lin Phyo 2017-08-21 16:11:34 +06:30
  • 3b5eb532d3 updateProduct yamin 2017-08-21 16:06:34 +06:30
  • 2a736cc92f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-21 13:30:28 +06:30
  • 7b0db433c4 commissioner scaffold Zin Lin Phyo 2017-08-21 13:30:04 +06:30
  • ce7d15c2d4 update dashboard Yan 2017-08-21 11:41:42 +06:30
  • 150c843fe0 Update yamin 2017-08-21 10:14:16 +06:30
  • dc95f78202 Merge branch 'master' into august_spring yamin 2017-08-21 10:12:47 +06:30
  • 8caf4b2612 Coupon / Voucher data change Phyo 2017-08-21 10:09:23 +06:30
  • 64ee766726 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder Aung Myo 2017-08-18 20:06:02 +06:30
  • 5c12fdeeaf update addorder Aung Myo 2017-08-18 20:05:25 +06:30
  • ba989d9243 update menu item api Yan 2017-08-18 20:02:24 +06:30
  • a1df5a0dbc update menu_sync Yan 2017-08-18 19:46:43 +06:30
  • 3b8a518357 update addorder Aung Myo 2017-08-18 19:09:09 +06:30
  • 3dbabdc1b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder Aung Myo 2017-08-18 14:02:15 +06:30
  • 4625694cf5 update addorder view Aung Myo 2017-08-18 13:28:53 +06:30
  • 48461da9ea add fields for Menu Sync Yan 2017-08-18 11:24:38 +06:30
  • 3160aab399 merge with addorder Yan 2017-08-17 18:59:22 +06:30
  • fcc5014b49 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-17 18:55:33 +06:30
  • e448265a48 update add oreder Aung Myo 2017-08-17 18:55:29 +06:30
  • 29b3f94573 add menu api Yan 2017-08-17 18:55:13 +06:30
  • 06619d30dc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-17 17:41:01 +06:30
  • 9702299fa7 Update Nweni 2017-08-17 17:40:18 +06:30
  • 7f2bfa2348 update add order and calculate subtotal Aung Myo 2017-08-17 13:51:01 +06:30
  • f2829fab0f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-17 13:50:24 +06:30
  • 88eb1d6c64 update seed Yan 2017-08-17 10:43:45 +06:30
  • d4d8961b87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder Aung Myo 2017-08-17 09:54:55 +06:30
  • 865c2c5cdd update add order Aung Myo 2017-08-17 09:54:19 +06:30
  • 0138ae2efa Fix Conflict Phyo 2017-08-16 18:38:41 +06:30
  • fc2927b341 Promotion CRUD Phyo 2017-08-16 18:36:23 +06:30
  • 0eee1fd0af menu ui update Yan 2017-08-16 18:26:30 +06:30
  • 4fc748e877 CRUDforProducts yamin 2017-08-16 18:19:20 +06:30
  • 73cceaf482 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-16 11:00:51 +06:30
  • db43ae186c DB for promtion, promotion product,product Phyo 2017-08-16 11:00:37 +06:30
  • 3e9b9c6b8b CalculatePriceInDiningCharges yamin 2017-08-16 10:46:03 +06:30
  • e791ce8809 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-15 17:27:48 +06:30
  • e0789ecb97 Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-15 17:24:46 +06:30
  • b2f00358f1 update ability for setmenu Aung Myo 2017-08-15 17:24:06 +06:30
  • 67c005a836 fixed Yan 2017-08-15 17:23:14 +06:30
  • 70dc3622ad update show for foc Aung Myo 2017-08-15 17:04:46 +06:30
  • 20bba0f659 merge with august_spring Yan 2017-08-15 17:04:28 +06:30
  • 513530e8f3 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-15 16:42:32 +06:30
  • e69eeadb6e add bootstrap file input and menu item img implemented Yan 2017-08-15 16:27:40 +06:30
  • e4a2d58e5e update foc and pdf Aung Myo 2017-08-15 15:14:55 +06:30
  • 74b15465f7 item foc in sale edit Zin Lin Phyo 2017-08-15 15:13:44 +06:30
  • 655b3ccef9 update menu item Aung Myo 2017-08-15 14:26:22 +06:30
  • 2da60ce6e3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-15 11:15:41 +06:30
  • e5a685f36e room charges Nweni 2017-08-15 11:14:38 +06:30
  • 74200bb2e7 update receipt bill pdf for foc and credit Aung Myo 2017-08-15 10:16:25 +06:30
  • 3bfc7f0f53 add CarrierWave gems for menu image upload Yan 2017-08-14 18:53:54 +06:30
  • f018a56027 add CarrierWave gems for menu image upload Yan 2017-08-14 18:53:39 +06:30
  • 997cc0733c add item set and menu item set CRUD Aung Myo 2017-08-14 17:57:55 +06:30
  • 0ec1657f7b Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-14 16:50:19 +06:30
  • 5fc485615c UpdateDiningCharges yamin 2017-08-14 16:49:39 +06:30
  • a01eaacbcb fix conflit Zin Lin Phyo 2017-08-14 16:46:26 +06:30
  • 7dae1c2c27 dashboard link Zin Lin Phyo 2017-08-14 16:43:35 +06:30
  • ac47d7d8f0 update dashbiard ui Yan 2017-08-14 15:57:34 +06:30
  • d5f6bca2b8 Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant into staging Aung Myo 2017-08-14 15:35:44 +06:30
  • edb4ab0425 Merge branch 'master' into menu_sync Yan 2017-08-14 15:34:19 +06:30
  • 624617fc02 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-14 15:33:28 +06:30
  • af3a7c1d88 Room Charges Bug Fix Phyo 2017-08-14 15:33:13 +06:30
  • 5a5e654dbc move css to css file Yan 2017-08-14 15:26:04 +06:30
  • 67b6da92ab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Aung Myo 2017-08-14 15:04:28 +06:30
  • a691eb8d64 update Aung Myo 2017-08-14 15:01:44 +06:30
  • 739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-14 14:40:43 +06:30
  • 0df8264de7 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-14 14:38:14 +06:30
  • 26e5472abc xMerge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-14 14:29:24 +06:30
  • 3c54f4da89 addQueryforwidthandheight yamin 2017-08-14 14:29:03 +06:30
  • 74d7adbaef deving item sets Yan 2017-08-14 14:27:37 +06:30