Commit Graph

  • 3a0e26b2ea accounts and discount updated Yan 2017-06-23 17:05:08 +06:30
  • f5f0f9e077 update crm customer and bind customer and queue Aung Myo 2017-06-23 17:03:52 +06:30
  • 55c8ab80da discount updated Yan 2017-06-23 11:40:11 +06:30
  • 68403617a5 Change Font and show status in origami Phyo 2017-06-23 11:14:48 +06:30
  • 62156e2e3e Employee Show Phyo 2017-06-23 11:13:29 +06:30
  • 69ec0386b9 Merge branch 'master' into settings_backend Phyo 2017-06-23 10:17:13 +06:30
  • 7dcc8547d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-23 09:50:52 +06:30
  • 19528b189f Update Nweni 2017-06-23 09:50:37 +06:30
  • 01e5b7ba6c update authorize Aung Myo 2017-06-23 09:41:48 +06:30
  • dfdbc1bfcc Merge branch 'master' into settings_backend Phyo 2017-06-23 09:14:32 +06:30
  • ea74d52a6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-22 18:26:36 +06:30
  • a90bbbebec merge with origin master Yan 2017-06-22 18:06:56 +06:30
  • 139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 18:05:38 +06:30
  • 618aed50dc merge with settings_backend Yan 2017-06-22 18:05:23 +06:30
  • 8ee37c5b52 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 18:03:55 +06:30
  • 5d60d620b4 add for room tab and complete Yan 2017-06-22 18:03:16 +06:30
  • 7bf2499e83 add options in oqs Yan 2017-06-22 17:32:13 +06:30
  • 298a06fc1e Show Local Time Phyo 2017-06-22 16:45:58 +06:30
  • 0c0e44c808 move table Nweni 2017-06-22 16:31:41 +06:30
  • b30d81508c add options in oqs Yan 2017-06-22 16:12:21 +06:30
  • 4254004423 Redeem Nett Button works Phyo 2017-06-22 15:36:36 +06:30
  • 5abda623ff Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into cancan Aung Myo 2017-06-22 15:35:27 +06:30
  • 25b6a893f2 first cancan Aung Myo 2017-06-22 15:33:55 +06:30
  • 4b9291110d update origami customer Aung Myo 2017-06-22 15:30:16 +06:30
  • cd5fdaac6a update origami scss Aung Myo 2017-06-22 15:28:40 +06:30
  • cb40f06854 fixed for customer Yan 2017-06-22 15:01:13 +06:30
  • f44abd5192 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 14:58:17 +06:30
  • 09252ba055 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-22 14:27:12 +06:30
  • 0ea2b778d1 multiple sale and order Nweni 2017-06-22 14:26:23 +06:30
  • 3d838bc989 update report and customer Aung Myo 2017-06-22 13:35:20 +06:30
  • f8cab803f8 Redeem amount bug fic Phyo 2017-06-22 13:31:54 +06:30
  • d1a4373171 Merge branch 'master' into settings_backend Phyo 2017-06-22 12:05:28 +06:30
  • 187caa5253 update customre Aung Myo 2017-06-22 11:58:16 +06:30
  • e0af272690 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-22 11:39:56 +06:30
  • 27b0ba72d7 changed in server master superuser 2017-06-22 11:38:42 +06:30
  • b13b0afa6c discuont updated for show Yan 2017-06-22 11:31:05 +06:30
  • 54526230aa update customerbind in origami Aung Myo 2017-06-22 10:25:40 +06:30
  • bded56a696 customer seed updated Yan 2017-06-22 10:11:50 +06:30
  • 7785ac99ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-22 09:53:43 +06:30
  • de8f577786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 09:53:04 +06:30
  • 77943f3bba Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 09:52:22 +06:30
  • 3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-22 09:51:22 +06:30
  • de38a50522 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-22 09:34:45 +06:30
  • 149b2b3559 Merge branch 'master' into settings_backend Phyo 2017-06-22 09:28:11 +06:30
  • 0ff10f2f32 move multiple order and sales Nweni 2017-06-22 05:51:42 +06:30
  • 168c571a23 multiple invoice Nweni 2017-06-22 05:24:31 +06:30
  • 2525bfbdd9 discount updated Yan 2017-06-21 20:30:12 +06:30
  • d95b7c7abc add confirm js and css Aung Myo 2017-06-21 19:20:10 +06:30
  • a6912d4e5b update customer search in card no Aung Myo 2017-06-21 18:30:51 +06:30
  • 3ba836b446 update customer transaction Aung Myo 2017-06-21 18:29:02 +06:30
  • c7139609c4 move table Nweni 2017-06-21 18:26:03 +06:30
  • d9d07a1cdc update reprint Aung Myo 2017-06-21 18:19:44 +06:30
  • 64210f30ac move table Nweni 2017-06-21 17:53:44 +06:30
  • d2549df2e9 update receipt bill payment Aung Myo 2017-06-21 17:37:16 +06:30
  • 51252b99e3 Auto Refresh on/off Phyo 2017-06-21 17:01:44 +06:30
  • 7c5456d712 assign table ,membership transaction and queue Aung Myo 2017-06-21 16:22:53 +06:30
  • e3b3ff76b2 add account_id to od_item and sale_item table Yan 2017-06-21 14:49:01 +06:30
  • bd71cfd241 Clock Reality in Origami Phyo 2017-06-21 13:21:40 +06:30
  • 209a453ca9 other payments delete button doesn't work Phyo 2017-06-21 11:39:53 +06:30
  • 9137436b70 bind origami show to action Yan 2017-06-21 11:38:28 +06:30
  • e3c83cdd44 discount ui changed Yan 2017-06-21 10:50:16 +06:30
  • 6c4c817453 fixed fonflict Aung Myo 2017-06-21 10:22:43 +06:30
  • 4ab5c311eb update crm Aung Myo 2017-06-21 10:05:07 +06:30
  • b889603ce6 update Nweni 2017-06-21 09:33:39 +06:30
  • 6272e07959 add back action Nweni 2017-06-21 06:19:06 +06:30
  • 895e028e7c added cashier station time Nweni 2017-06-21 05:55:45 +06:30
  • fa309fb89a move whole table Nweni 2017-06-21 05:36:58 +06:30
  • 6207f1ce24 editing discount Yan 2017-06-20 19:28:21 +06:30
  • f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-20 19:00:02 +06:30
  • a9e1d8c3d1 origami Nweni 2017-06-20 18:59:34 +06:30
  • 242eb80081 defaults json in oqs for create Yan 2017-06-20 18:25:45 +06:30
  • 0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-20 17:59:14 +06:30
  • 33cb8b64a3 finished customer form and update Aung Myo 2017-06-20 17:57:50 +06:30
  • 64db775dd3 edited api/bill_controller superuser 2017-06-20 16:13:13 +06:30
  • 6528845d82 oqs updated Yan 2017-06-20 15:58:50 +06:30
  • dd2a2e54a4 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-20 14:21:58 +06:30
  • e43818fdf5 oqs updated Yan 2017-06-20 13:33:41 +06:30
  • 80362f87fe Rebate Option Phyo 2017-06-20 13:22:27 +06:30
  • faae996d5d Rebate balance in receipt Aung Myo 2017-06-20 11:31:02 +06:30
  • bdb42daad7 dining facility model Nweni 2017-06-20 07:42:05 +06:30
  • 6035e6612a udpate Nweni 2017-06-20 07:40:24 +06:30
  • a71ee3657a origami changes Nweni 2017-06-20 07:36:38 +06:30
  • 7fe36e8ef4 merge with settings Yan 2017-06-19 19:14:58 +06:30
  • c95b0130dc edit migrate oqs Yan 2017-06-19 18:56:36 +06:30
  • 90be2b8d63 OQS edit bug fix Phyo 2017-06-19 18:54:19 +06:30
  • 9089eab196 temp remove options in oqs Yan 2017-06-19 17:36:39 +06:30
  • c02e305c30 Zone Created_at Bug Fix Phyo 2017-06-19 16:24:44 +06:30
  • d78327f906 Membership Setting UI Phyo 2017-06-19 16:22:39 +06:30
  • 2cc8d2c00c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-19 15:56:57 +06:30
  • 35fc649df3 pg order Nweni 2017-06-19 15:56:45 +06:30
  • d8930cb2b5 still Yan 2017-06-19 15:55:21 +06:30
  • fcd1590868 change query Nweni 2017-06-19 15:51:04 +06:30
  • 184dcb53a1 Conflict fix din settings_backend Phyo 2017-06-19 15:24:15 +06:30
  • a622b76643 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend Nweni 2017-06-19 15:23:23 +06:30
  • cd3177c682 order Nweni 2017-06-19 15:22:50 +06:30
  • 2dbbb17634 Add extra fields to accounts Phyo 2017-06-19 12:21:54 +06:30
  • 33128d26a2 add Back Button in Redeem Phyo 2017-06-19 12:17:08 +06:30
  • b826b479cd update for oqs print Yan 2017-06-19 12:07:43 +06:30
  • dd3c429301 control paypar url and oqs fix Yan 2017-06-19 11:56:26 +06:30
  • e693927016 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-19 11:55:01 +06:30