Commit Graph

  • 8f0b44ca7b price 0 print Yan 2017-11-23 12:53:07 +06:30
  • 502b92fb98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-23 12:15:01 +06:30
  • edd28332da Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-23 12:14:32 +06:30
  • f4898017d1 price 0 print Yan 2017-11-23 12:14:14 +06:30
  • b64229aded change UI and query for dashboard and UI for Origami/Commissions phyusin 2017-11-23 11:56:49 +06:30
  • 69dccb6770 update addorder and mem_action for additional para Aung Myo 2017-11-23 11:50:19 +06:30
  • 86ec4c7c80 change UI for logout phyusin 2017-11-23 11:07:21 +06:30
  • fcb3c63b2f update customer scss Aung Myo 2017-11-23 10:41:25 +06:30
  • 54120d7a46 update customer view and order add column table and orderby Aung Myo 2017-11-23 10:32:20 +06:30
  • abca17756f change UI for CRM/Customers phyusin 2017-11-23 10:14:06 +06:30
  • 3261fef3cf fix dis and payment foc and sale item report Yan 2017-11-22 20:47:53 +06:30
  • 06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-22 18:40:38 +06:30
  • f8e6291d1b Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-22 18:39:56 +06:30
  • 6beb32348d major fix taxable price for sale and other sale and oqs Yan 2017-11-22 18:39:35 +06:30
  • 50de7dd377 change UI for Customer phyusin 2017-11-22 18:35:44 +06:30
  • 5ff93ad20d add icon before Logout phyusin 2017-11-22 17:36:08 +06:30
  • 6791a5cba9 change UI for inventory phyusin 2017-11-22 17:10:54 +06:30
  • 5a3ced9746 change UI for CRM/Queue phyusin 2017-11-22 17:00:13 +06:30
  • fafd6df5e1 update addorder and show_account_info add shops Aung Myo 2017-11-22 16:49:34 +06:30
  • afcf7725f5 change UI for all settings module phyusin 2017-11-22 16:28:17 +06:30
  • d3ceba0a7a update add order Aung Myo 2017-11-22 15:54:58 +06:30
  • 2cc8b820db puma to gitignore Yan 2017-11-22 13:42:19 +06:30
  • fb53f2cb75 change dashboard summary text phyusin 2017-11-22 13:35:43 +06:30
  • dde553ebe2 change total card query phyusin 2017-11-22 13:27:22 +06:30
  • 1fd4108ac0 change all sale item Yan 2017-11-22 12:12:27 +06:30
  • 5b7ba0c144 update supervisor wrong spelling Aung Myo 2017-11-22 10:40:43 +06:30
  • 77ce2f32ff Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-22 10:40:34 +06:30
  • b75d8cc176 change supervisour to supervisor in db/seeds.eb phyusin 2017-11-22 10:31:55 +06:30
  • 9e188104fb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-22 10:23:39 +06:30
  • 2852a3bb93 change radio btn for CRM/New Registration phyusin 2017-11-22 10:22:52 +06:30
  • 749e271879 update saleitem rb syntax err Aung Myo 2017-11-22 09:59:13 +06:30
  • fb235f0b1c puma update Yan 2017-11-21 19:53:17 +06:30
  • 6ce3f8e044 add sale items in sale item model Yan 2017-11-21 19:33:20 +06:30
  • f7cad204af Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-21 18:36:58 +06:30
  • 3041d6a368 update search data in transaction Aung Myo 2017-11-21 18:29:41 +06:30
  • efa591524f origami discount UI phyusin 2017-11-21 17:44:43 +06:30
  • 0b374cf3b2 change UI for simple menu item, promotion, setting/OQS phyusin 2017-11-21 17:41:05 +06:30
  • 25a3655909 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-21 17:33:00 +06:30
  • 0fdc22b981 puma config Yan 2017-11-21 17:31:40 +06:30
  • 01bf7caeb5 update oragimi view Aung Myo 2017-11-21 17:21:31 +06:30
  • 9e1b82ffea puma config Yan 2017-11-21 17:20:24 +06:30
  • 68937617f9 puma config Yan 2017-11-21 17:14:08 +06:30
  • 789cc179d7 update addorder adn survey form select for foreigner Aung Myo 2017-11-21 17:00:20 +06:30
  • 59dca270c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-21 16:49:57 +06:30
  • 2b595ba212 update addorder for not have instance in item Aung Myo 2017-11-21 16:49:23 +06:30
  • 7252e39515 merge with aung Yan 2017-11-21 16:47:07 +06:30
  • ad66a6570b add popper.js.map and remove .idea Yan 2017-11-21 16:30:56 +06:30
  • 21bd0f9575 update sqa testing feedback Aung Myo 2017-11-21 16:04:45 +06:30
  • 861e554d63 fix for dining charges taxable price and ui modified Yan 2017-11-21 12:10:53 +06:30
  • a92a1298a3 change <p> to <a> tag in autocomplete phyusin 2017-11-21 09:41:11 +06:30
  • 3eddb05ff8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-21 09:23:15 +06:30
  • 71a03a56d4 update oqs view Aung Myo 2017-11-21 09:19:18 +06:30
  • 22b5421603 dev done license Yan 2017-11-20 19:15:32 +06:30
  • 55606cb959 autocomplete for CRM/QUEUE phyusin 2017-11-20 19:15:26 +06:30
  • 51cda9dfb2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-20 14:56:25 +06:30
  • b046086ea4 Merge branch 'master' into license Yan 2017-11-20 13:54:54 +06:30
  • a423807554 crm index ui and remove zone and dining from seed Yan 2017-11-20 12:23:49 +06:30
  • 0a283d448e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-20 09:18:47 +06:30
  • 3aac2629c9 queue card ui Yan 2017-11-17 19:55:26 +06:30
  • 2555efa186 add order double click fix Yan 2017-11-17 18:43:42 +06:30
  • d5fb88a275 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-17 18:28:21 +06:30
  • e95562ad20 edit addorder loading to oqs_loading Yan 2017-11-17 18:27:48 +06:30
  • 3a91568664 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-17 18:26:27 +06:30
  • 66e6b69f12 add booking for assign customer in CRM phyusin 2017-11-17 18:26:01 +06:30
  • c56fb1b0f4 oqs back turbolink control Yan 2017-11-17 16:39:37 +06:30
  • 11f040b142 fix oqs css and oqs edit turbolink control Yan 2017-11-17 16:31:03 +06:30
  • 6c03d0249c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-17 15:51:40 +06:30
  • e7cd8deb8e fix tester bugs Yan 2017-11-17 15:51:20 +06:30
  • 30e6b46237 update backk buttom in oqs Aung Myo 2017-11-17 14:31:19 +06:30
  • 73da4841c6 update salepayment for puts Aung Myo 2017-11-17 13:50:27 +06:30
  • a3eb2e44eb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-17 13:33:11 +06:30
  • 68a0f7eca3 license sym config Yan 2017-11-17 13:32:49 +06:30
  • 02bf6f03f1 update customer show Aung Myo 2017-11-17 11:58:46 +06:30
  • 393d0badc3 update customer transaction list Aung Myo 2017-11-17 11:47:42 +06:30
  • 34fd7a80d6 Merge branch 'master' into license Yan 2017-11-17 10:25:32 +06:30
  • f333aa9a66 add top10 and bottom10 products in dashboard phyusin 2017-11-17 10:22:04 +06:30
  • e5831f92f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-17 10:03:59 +06:30
  • 4899e624ef change dashboard ui phyusin 2017-11-17 09:56:40 +06:30
  • cd7ae874b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-17 09:48:17 +06:30
  • 9b1bc61adc update cus show Aung Myo 2017-11-17 09:47:09 +06:30
  • a175ce3aeb temp fix get current booking Yan 2017-11-16 21:14:59 +06:30
  • 25fef8e61c check req bill cntrl Yan 2017-11-16 21:12:16 +06:30
  • f18947789c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-16 20:48:58 +06:30
  • 29322d952e license cloud done Yan 2017-11-16 20:46:03 +06:30
  • c0733d7c48 update queue view Aung Myo 2017-11-16 19:26:52 +06:30
  • 384c0f2dd2 align summary panel in dashboard phyusin 2017-11-16 18:23:42 +06:30
  • b09061d9c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-16 18:19:05 +06:30
  • d648bbf100 dashboard ui and checkin checkout process phyusin 2017-11-16 18:17:40 +06:30
  • 178b3484be added license Yan 2017-11-16 16:13:26 +06:30
  • fd81cdf3ef update addorder Aung Myo 2017-11-16 14:27:17 +06:30
  • 6360a914b4 update add order for popup qty Aung Myo 2017-11-16 14:23:51 +06:30
  • d107577ea7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-16 10:20:45 +06:30
  • ccbdd5b2c8 update shift sale detail Aung Myo 2017-11-16 10:03:01 +06:30
  • 059d1fc853 remove log in custom js Yan 2017-11-15 19:15:20 +06:30
  • b1f98df4e0 add activation in license Yan 2017-11-15 19:10:56 +06:30
  • f8823360e3 add instance code to assigned_order_items Yan 2017-11-15 17:59:32 +06:30
  • 50aca66abe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-15 17:56:16 +06:30
  • c2095b4a61 adding license activation Yan 2017-11-15 17:55:51 +06:30
  • bf0a8135f6 update rebate for credit and redeem Aung Myo 2017-11-15 17:54:59 +06:30
  • 50bf67f5e5 miss and add instance in oqs Yan 2017-11-15 16:46:00 +06:30