Commit Graph

  • bcfd088d5d changing dashboard Yan 2017-09-20 16:29:27 +06:30
  • 7191f0511c update sym master.sql Aung Myo 2017-09-19 18:02:23 +06:30
  • e3a76f7095 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-09-19 14:32:52 +06:30
  • a5473503fb update menu_item json for attribute name Aung Myo 2017-09-19 14:32:04 +06:30
  • 6514fc5285 update sym_master.sql Aung Myo 2017-09-19 14:30:27 +06:30
  • 4779b6a19f update Aung Myo 2017-09-19 11:09:23 +06:30
  • f4270ffd87 fix promotion date format Yan 2017-09-18 17:36:17 +06:30
  • 1af1a56d0d merge with staging Yan 2017-09-18 14:53:25 +06:30
  • 8966f290b5 pull origin master Yan 2017-09-18 13:53:28 +06:30
  • 3e0371a9fb done Yan 2017-09-15 14:20:53 +06:30
  • f5c32229b7 Merge branch 'master' into qr_code Yan 2017-09-15 10:06:58 +06:30
  • 5c96dcac81 Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-14 18:23:43 +06:30
  • 77c399d7cd add qr Yan 2017-09-14 18:23:16 +06:30
  • 07ea214eee update other payment alert box Aung Myo 2017-09-14 17:49:11 +06:30
  • e878a6387e update member discount Aung Myo 2017-09-14 17:36:00 +06:30
  • 36f6da4470 Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-14 14:11:38 +06:30
  • baa3da9b5c add qr code Yan 2017-09-14 14:10:55 +06:30
  • 6482f05218 adding qr Yan 2017-09-13 18:38:05 +06:30
  • 807d472c01 merge with master Yan 2017-09-13 14:46:51 +06:30
  • 90681cddcc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs Aung Myo 2017-09-13 14:21:52 +06:30
  • abde6745a4 update addorder modefined Aung Myo 2017-09-13 12:27:37 +06:30
  • bbcce13a2e update addorder Aung Myo 2017-09-13 09:21:35 +06:30
  • 4b732e8d8c menu edit fix Yan 2017-09-12 17:23:42 +06:30
  • 101b9511da fix menu_item api Yan 2017-09-12 14:37:33 +06:30
  • 569664f48a fix menu_item api Yan 2017-09-11 18:33:56 +06:30
  • 89e6a7161a bug menu item api Yan 2017-09-11 18:30:49 +06:30
  • 6db3e96c1c Merge branch 'qr_code' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-11 17:04:22 +06:30
  • 8ec820a624 bill cable add and add ... for origami pages Yan 2017-09-11 16:38:32 +06:30
  • c3b38a860c bill cable add and add ... for origami pages Yan 2017-09-11 16:37:50 +06:30
  • c131a4eff2 fix dining charge calc Yan 2017-09-11 15:47:32 +06:30
  • 361e439664 update qr code Aung Myo 2017-09-11 15:44:45 +06:30
  • ea02f6b8fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-11 14:05:35 +06:30
  • efb60e6f79 add calc tax order in sale Yan 2017-09-11 14:05:19 +06:30
  • b4ceff9631 add calc tax order flag in shop table Yan 2017-09-11 13:56:49 +06:30
  • fa7fcdd559 Room Charges(Account ID change,add dropdown list,tac not calculate) Phyo 2017-09-11 13:55:38 +06:30
  • 10bd525d02 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix Yan 2017-09-08 13:50:55 +06:30
  • 69c52bf28b Dininng Charges Free time Count Change Phyo 2017-09-08 13:45:52 +06:30
  • e7f1964a78 Promotion over two promotion products Phyo 2017-09-08 11:38:34 +06:30
  • 3e76509347 remove console log Yan 2017-09-07 18:06:59 +06:30
  • 3d7295c081 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-07 15:37:12 +06:30
  • f67d4197ec add bill channel for req bill Yan 2017-09-07 15:35:00 +06:30
  • e9a305b573 remove auto refresh in origami Yan 2017-09-07 13:55:40 +06:30
  • 43cc308d89 stock check report Zin Lin Phyo 2017-09-07 10:30:20 +06:30
  • a50becb365 merge with august_spring Yan 2017-09-06 18:32:45 +06:30
  • 2e53b72574 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-09-06 18:28:09 +06:30
  • 5e1e0cd5b9 stock_check report template Zin Lin Phyo 2017-09-06 18:27:58 +06:30
  • 9d47414292 Timepicker Bug Fix Phyo 2017-09-06 18:03:53 +06:30
  • 4ca3b708c4 Show data in Edit Phyo 2017-09-06 17:01:33 +06:30
  • a9d31935a1 update addorder bugs Aung Myo 2017-09-06 13:22:46 +06:30
  • 784e740da3 rename in_juty to in_duty Zin Lin Phyo 2017-09-06 11:18:02 +06:30
  • d1db57e9b5 update oqs action cable sorting Aung Myo 2017-09-05 18:06:57 +06:30
  • bb6e938f47 update oqs action cable for order cahnnel and oqs channel Aung Myo 2017-09-05 16:51:41 +06:30
  • 31021813b0 inventory list and stock check Zin Lin Phyo 2017-09-05 16:47:50 +06:30
  • 6a04f2b213 del menu images Yan 2017-09-05 14:17:00 +06:30
  • 995ee8298e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-05 14:14:10 +06:30
  • 721f142971 Merge branch 'master-bug-fix' of bitbucket.org:code2lab/sxrestaurant Yan 2017-09-05 14:13:26 +06:30
  • 3dc7fea339 date format fix for promotion Yan 2017-09-05 14:12:53 +06:30
  • 4a85039170 update oqs action cable for order cahnnel and oqs channel Aung Myo 2017-09-05 14:07:20 +06:30
  • 0dba573607 Merge branch 'master-bug-fix' Yan 2017-09-05 13:54:09 +06:30
  • d0a527d1ee code review and fix Yan 2017-09-05 13:53:06 +06:30
  • f56b7ab26e Promotion Destory Bug Fix Phyo 2017-09-05 10:44:33 +06:30
  • c64541a410 Merge branch 'master-bug-fix' Yan 2017-09-05 10:38:57 +06:30
  • 4b4f44f37e code reviews and add bootstrp font Yan 2017-09-05 10:38:37 +06:30
  • eeb2a91ce9 update oqs action cable for order cahnnel and oqs channel Aung Myo 2017-09-05 09:41:05 +06:30
  • 081710e71c Merge branch 'master-bug-fix' Yan 2017-09-04 18:04:17 +06:30
  • 4f3b831771 Merge branch 'master' into staging Yan 2017-09-04 18:02:49 +06:30
  • 7eff82d87d add public/image to gitignore Yan 2017-09-04 18:02:41 +06:30
  • e6ee2c43df add public/image to gitignore Yan 2017-09-04 18:01:48 +06:30
  • a4884c9bea item instance code add to sale_item Yan 2017-09-04 15:10:26 +06:30
  • 008da6ee47 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix Yan 2017-09-04 14:58:30 +06:30
  • fc6dd212c3 image add in gitignore Yan 2017-09-04 14:53:02 +06:30
  • 6c94ba5457 in_juty ui update Zin Lin Phyo 2017-09-04 14:47:58 +06:30
  • 82120e2ba1 updated commission for sale edit Yan 2017-09-04 13:13:08 +06:30
  • 2330a1a33e calculate commission in sale_edit, void, foc Zin Lin Phyo 2017-09-04 12:09:04 +06:30
  • c2d86cb17c Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-09-04 10:24:54 +06:30
  • 98dae6d712 show and update changes in commission and report Zin Lin Phyo 2017-09-04 10:24:24 +06:30
  • 2eaf891748 Promotion multiple order Phyo 2017-09-04 10:22:54 +06:30
  • d715809b20 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs Aung Myo 2017-09-01 16:57:04 +06:30
  • fc5192157b update Aung Myo 2017-09-01 16:55:51 +06:30
  • e9e7aec028 update item edit Yan 2017-09-01 16:03:55 +06:30
  • 09ba513c1c fixed conflict Nweni 2017-09-01 09:42:10 +06:30
  • ed17e5fd32 Update Nweni 2017-09-01 09:40:50 +06:30
  • 3726e8a7c3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-31 18:09:35 +06:30
  • 0fbce1ca7c fix conflit Zin Lin Phyo 2017-08-31 18:07:05 +06:30
  • 0584530224 for pull Zin Lin Phyo 2017-08-31 18:06:13 +06:30
  • e35378bd36 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-31 18:05:43 +06:30
  • db248d69cd Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-31 17:18:23 +06:30
  • 21a9f77c59 Update yamin 2017-08-31 17:05:07 +06:30
  • b311df9a0b promotionDay yamin 2017-08-31 16:59:32 +06:30
  • e09559c508 merge with august spring but merge fail Yan 2017-08-31 15:58:01 +06:30
  • a1341d0b10 fixed conflict Nweni 2017-08-31 15:30:02 +06:30
  • 12c8be597d Inventory Stock Check Print Nweni 2017-08-31 15:29:36 +06:30
  • d1003e2f6a move load_commissioner to origamin/product_commission Zin Lin Phyo 2017-08-31 14:15:09 +06:30
  • dd19b52ebd Promotion Index View Change Phyo 2017-08-31 14:03:43 +06:30
  • 2be93e413d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs Aung Myo 2017-08-31 13:48:24 +06:30
  • 122c4b72fd updat Aung Myo 2017-08-31 13:47:55 +06:30
  • 2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-31 12:10:31 +06:30
  • 2399f1d494 update form attr name to attr id to instances Yan 2017-08-31 11:41:38 +06:30
  • 449969fa5b update addorder Aung Myo 2017-08-31 11:22:12 +06:30
  • 4b74f2c128 fix conflit Zin Lin Phyo 2017-08-31 10:23:19 +06:30