Commit Graph

  • 394d2ed938 change transactional primary key to custom ID for better portability Min Zeya Phyo 2017-06-03 19:12:35 +06:30
  • a01c4bd9cf Menu Item instances and OQS json saving PhyoTheingi 2017-06-03 17:09:56 +06:30
  • a2c9996b76 Finished Request Bill print function Aung Myo 2017-06-03 17:04:17 +06:30
  • 9dddd2fc78 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-03 15:05:25 +06:30
  • eab356233c add new model - shop - it will be use to define what is setup Min Zeya Phyo 2017-06-03 15:04:53 +06:30
  • bf8679c201 Merge branch 'shop_setup' Min Zeya Phyo 2017-06-03 14:26:45 +06:30
  • 138850fb24 origin pull master Aung Myo 2017-06-03 13:44:10 +06:30
  • 7529d23147 update booking status and view Aung Myo 2017-06-03 13:32:13 +06:30
  • 622ca05c9e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-03 13:27:11 +06:30
  • aa36c679ab oqs item count fixed Yan 2017-06-03 13:25:23 +06:30
  • 03ae60d2e6 merge all 03062017 Yan 2017-06-03 12:50:08 +06:30
  • 4dbf52d5a4 remove ignore for gemfile and gemfile.lock, re-add mysql2 Min Zeya Phyo 2017-06-03 12:48:05 +06:30
  • 2e2bda168c print developing Yan 2017-06-03 12:41:24 +06:30
  • 2716b913f2 Setting Instances Update PhyoTheingi 2017-06-03 11:59:29 +06:30
  • bd1414e07f Gemfile and gem lock Aung Myo 2017-06-03 10:59:46 +06:30
  • 2374fedca5 account show.html Aung Myo 2017-06-03 10:37:05 +06:30
  • 030d3ffb0f confict clear Aung Myo 2017-06-02 19:22:01 +06:30
  • 01fefe3b79 account working Aung Myo 2017-06-02 19:16:14 +06:30
  • ea082f0d43 creating order queue printer Yan 2017-06-02 19:01:28 +06:30
  • 90ca4651aa add print controller Yan 2017-06-02 18:50:21 +06:30
  • 3d05a91adf Print ui update Yan 2017-06-02 18:49:44 +06:30
  • 63be238e09 uncomplete print, need for print_settings Yan 2017-06-02 18:26:44 +06:30
  • 7146a1028a update Cherry 2017-06-02 17:53:25 +06:30
  • 9afe39b7e2 commit for sales Cherry 2017-06-02 17:48:03 +06:30
  • 6d705e2860 merge with master Yan 2017-06-02 16:52:58 +06:30
  • 022a2e005f initial print setup Yan 2017-06-02 16:22:15 +06:30
  • 98a7c31ffa initial setup for print Yan 2017-06-02 16:21:47 +06:30
  • 7e46e3c634 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-02 14:58:29 +06:30
  • 92a82f6e7f missing bookings controller adding Aung Myo 2017-06-02 14:52:14 +06:30
  • 840bb52365 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-02 14:48:11 +06:30
  • 7d5e5e7129 update menu item instance Yan 2017-06-02 14:47:34 +06:30
  • 5d608b8a57 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-02 14:03:40 +06:30
  • 4e36cad341 update booking complete and cancle in crm Aung Myo 2017-06-02 14:02:54 +06:30
  • f89a4237df Menu Item Instance PhyoTheingi 2017-06-02 14:02:03 +06:30
  • 4313032875 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-02 14:00:23 +06:30
  • 165317a536 update booking complete and cancle in crm Aung Myo 2017-06-02 13:59:45 +06:30
  • 17206001c4 updated oqs ui Yan 2017-06-02 13:58:35 +06:30
  • 59e4c72e2f get udpate Nweni 2017-06-02 13:22:04 +06:30
  • ed6de14412 update booking controller in crm Aung Myo 2017-06-02 13:17:09 +06:30
  • 0c82c16293 Order Queue Station Bug Fix PhyoTheingi 2017-06-02 11:38:46 +06:30
  • a9259ca845 order Nweni 2017-06-02 11:30:10 +06:30
  • 95fd260c76 updated ui Yan 2017-06-02 11:28:07 +06:30
  • c9782bf84a update booking with cancel and assign Aung Myo 2017-06-02 10:52:46 +06:30
  • 0fa9cd0cac Sub Menu Item Showing PhyoTheingi 2017-06-02 09:50:48 +06:30
  • acbd8acf04 Append Order Detail view finished Aung Myo 2017-06-01 18:47:08 +06:30
  • 7020d4957a constraint to min_qty PhyoTheingi 2017-06-01 18:44:30 +06:30
  • f28f0bf292 UI updated Yan 2017-06-01 18:37:15 +06:30
  • 166e416277 Menu Item Option Route Fix PhyoTheingi 2017-06-01 17:56:56 +06:30
  • 926c54c079 Merge branch 'settings_backend' Nweni 2017-06-01 17:14:57 +06:30
  • e200dcd438 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into settings_backend Nweni 2017-06-01 17:14:35 +06:30
  • ad38a0a708 gem lock Nweni 2017-06-01 17:13:30 +06:30
  • 89c6228c31 UI phrase 1 PhyoTheingi 2017-06-01 17:10:04 +06:30
  • a7d7260157 Bug Fix PhyoTheingi 2017-06-01 14:00:08 +06:30
  • 584d745301 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-01 13:21:09 +06:30
  • 0a223a03f5 remove order_queue_item Nweni 2017-06-01 13:12:36 +06:30
  • 356923a9d8 pull master Yan 2017-06-01 12:11:23 +06:30
  • 2a323c8d0d deleted order queue item Yan 2017-06-01 12:07:27 +06:30
  • 2d511cc63e Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-01 10:09:22 +06:30
  • 6b2a496830 merged origami Yan 2017-06-01 10:08:55 +06:30
  • 03bf799708 Set_item Create PhyoTheingi 2017-06-01 10:03:07 +06:30
  • 82d7d7ffcc merge crm Yan 2017-06-01 09:59:43 +06:30
  • 47469cf466 Origami update commit Cherry 2017-06-01 09:27:37 +06:30
  • 4271681638 Support both mysql and pg Min Zeya Phyo 2017-06-01 10:49:20 +08:00
  • 0189c01e04 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-05-31 23:50:06 +08:00
  • 44c4dd0d78 nothing change Yan 2017-05-31 22:16:55 +06:30
  • 5a564abca9 oqs sample Yan 2017-05-31 22:14:46 +06:30
  • a67c76d945 Menu 2nd Phrase PhyoTheingi 2017-05-31 18:27:31 +06:30
  • f036274f5e finished order tab view and customer tab Aung Myo 2017-05-31 18:19:51 +06:30
  • 44e7d2452f tables origami Cherry 2017-05-31 18:19:17 +06:30
  • 9cc0165cf5 fixed conflict Cherry 2017-05-31 16:28:39 +06:30
  • b3b2e9bd8d order controller updated Cherry 2017-05-31 16:24:34 +06:30
  • 8847cf8bf3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-05-31 14:01:15 +06:30
  • 9156763ccb crm home view Aung Myo 2017-05-31 14:01:00 +06:30
  • 1ed15e2e0d pull master Yan 2017-05-31 13:54:01 +06:30
  • 314372ef75 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs Yan 2017-05-31 13:52:51 +06:30
  • a86ab147c8 ignore gems Yan 2017-05-31 13:47:55 +06:30
  • 0b8ec22976 deleted queue_items Yan 2017-05-31 13:42:44 +06:30
  • 0a000761fb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into settings_backend Nweni 2017-05-31 13:41:00 +06:30
  • 7e7b89e143 added order_queue_item Nweni 2017-05-31 13:40:48 +06:30
  • 2703f59d8c bookings tab view Aung Myo 2017-05-31 11:25:24 +06:30
  • 136a52c4ac bookings tab view Aung Myo 2017-05-31 11:24:12 +06:30
  • 1d8b03b6ab update Nweni 2017-05-31 10:26:16 +06:30
  • 85b9ffaf20 gem lock Nweni 2017-05-31 10:04:37 +06:30
  • fda69012da Menu Category path fixing PhyoTheingi 2017-05-31 09:36:10 +06:30
  • fd4bf6912f for checkout new branch Cherry 2017-05-31 09:13:01 +06:30
  • 516b854fba shop_setup branch Min Zeya Phyo 2017-05-30 23:46:22 +08:00
  • e46fe1ec7c add cable but not complete Yan 2017-05-30 19:02:40 +06:30
  • 9361e24a8a remove sale_discount from model list Min Zeya Phyo 2017-05-30 12:42:50 +06:30
  • d7d29e4d16 sales listing under transacitons Min Zeya Phyo 2017-05-29 18:55:34 +06:30
  • c7a4adc7cc sale voucher wrong spelling Min Zeya Phyo 2017-05-29 18:46:03 +06:30
  • de29de486f menu items Min Zeya Phyo 2017-05-29 15:27:22 +06:30
  • 08f993d621 Order queue stations Min Zeya Phyo 2017-05-28 13:30:30 +06:30
  • 112fe8b56b rails 5.1 updates Min Zeya Phyo 2017-05-22 15:27:34 +06:30
  • d94f9611ad rename ruby-version Yan 2017-05-11 15:05:42 +06:30
  • 56a465448a dashboard Min Zeya Phyo 2017-05-11 14:14:29 +06:30
  • c1c72eca30 more controller for cashier/waiter view Min Zeya Phyo 2017-05-10 01:10:21 +06:30
  • 62e8615f12 receipt update Min Zeya Phyo 2017-04-22 00:09:07 +06:30
  • f860954a7f final format Min Zeya Phyo 2017-04-21 23:46:38 +06:30
  • db3b50a496 frontend view layout Min Zeya Phyo 2017-04-21 05:07:00 +06:30
  • e1e102fd15 user role scoped layout and controller Min Zeya Phyo 2017-04-20 22:29:39 +06:30