Commit Graph

  • e50915aa3b Add Dinein, Takeway, Change Total to Gross Sale,Grand Total San Wai Lwin 2018-02-15 18:35:33 +06:30
  • cf644892c9 update pending and quick service Aung Myo 2018-02-15 15:26:34 +06:30
  • 016d3f4187 sqa San Wai Lwin 2018-02-15 13:29:52 +06:30
  • d8d119edd6 release_c1 San Wai Lwin 2018-02-15 13:27:45 +06:30
  • e77d523a7f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-15 13:24:41 +06:30
  • d31c936547 for all items phyusin 2018-02-15 13:24:29 +06:30
  • 2f08fe03b6 Merge branch 'sqa-1802-001' into r-1802001-01 San Wai Lwin 2018-02-15 12:16:41 +06:30
  • 35721cd917 remove space line San Wai Lwin 2018-02-15 12:15:39 +06:30
  • dff0a4798e add new line San Wai Lwin 2018-02-15 12:11:54 +06:30
  • 47adec6468 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1802-001 Aung Myo 2018-02-15 11:59:32 +06:30
  • 4794f6cce7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-02-15 11:52:03 +06:30
  • d98f8782b1 update order summary pdf for before_qty_update Aung Myo 2018-02-15 11:51:51 +06:30
  • a8fdf2ec30 update discount for qs Aung Myo 2018-02-15 11:49:01 +06:30
  • a2bd8795cc update discount for qs Aung Myo 2018-02-15 11:23:40 +06:30
  • 4a0b88cfb9 update application for license Aung Myo 2018-02-15 10:42:02 +06:30
  • 0d515d9c93 paending order sale model Aung Myo 2018-02-15 10:27:00 +06:30
  • 47ffc5fa51 update no table quick srevice Aung Myo 2018-02-14 18:21:10 +06:30
  • 37c94b3665 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-02-14 17:33:18 +06:30
  • 4f1a6fefe7 check void for table status update phyusin 2018-02-14 17:32:34 +06:30
  • 8898ba597a change split bill phyusin 2018-02-14 17:07:33 +06:30
  • 9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-14 15:01:57 +06:30
  • a2e7ebd27a update payment show Aung Myo 2018-02-14 15:00:16 +06:30
  • 75cadc7ed3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-14 14:46:44 +06:30
  • d83d3fd998 Merge branch 'sqa_test' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-02-14 14:45:46 +06:30
  • 867148a038 db/sym_master.sql phyusin 2018-02-14 14:45:14 +06:30
  • a5c72b6540 test no table Aung Myo 2018-02-14 14:40:28 +06:30
  • a4ec4bf7c7 db/sym_master.sql phyusin 2018-02-14 14:39:48 +06:30
  • 50948be8bf sym_master phyusin 2018-02-14 14:37:28 +06:30
  • 80ab7e7c12 test no table Aung Myo 2018-02-14 14:33:30 +06:30
  • b2cec95064 test no table Aung Myo 2018-02-14 14:26:36 +06:30
  • 4203aa995e conflict data phyusin 2018-02-14 14:24:01 +06:30
  • 91aa216666 check booking sale id is null for all order phyusin 2018-02-14 14:20:20 +06:30
  • f19fb769f6 change split bill process phyusin 2018-02-14 14:14:53 +06:30
  • 54354f0aea Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test Aung Myo 2018-02-14 14:00:24 +06:30
  • 086d5a7306 update symn for display images Aung Myo 2018-02-14 13:59:28 +06:30
  • 85c641c9ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test Aung Myo 2018-02-14 13:47:16 +06:30
  • 08e372cfb5 udpdate qs Aung Myo 2018-02-14 13:46:22 +06:30
  • 13ab1ff5be Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-14 09:43:14 +06:30
  • 1b1ab32328 update sym_master Aung Myo 2018-02-13 16:55:28 +06:30
  • 6978dc5450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test Aung Myo 2018-02-13 15:12:33 +06:30
  • 22a9e75efa update license and sym_master Aung Myo 2018-02-13 15:12:09 +06:30
  • 23cb3dbbc1 gemfile.lock phyusin 2018-02-13 13:48:25 +06:30
  • 76b6e63fd3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-13 13:39:43 +06:30
  • 5ef5ff4fbe add column to existing table and new table for second display images phyusin 2018-02-13 13:29:19 +06:30
  • 839fb14436 update inventory Aung Myo 2018-02-13 11:34:06 +06:30
  • 5854bd88e1 update liscense file Aung Myo 2018-02-13 10:53:29 +06:30
  • a844b51b39 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-09 15:08:07 +06:30
  • 7c07cd0118 update dashbord Aung Myo 2018-02-09 15:07:39 +06:30
  • 1b1ffa1146 check receipt phyusin 2018-02-09 15:07:01 +06:30
  • b1e58ceb64 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-09 14:58:53 +06:30
  • 974dde54c0 update shop.name Aung Myo 2018-02-09 14:58:08 +06:30
  • c902e2ea1b check one condition in order item phyusin 2018-02-09 14:56:33 +06:30
  • aeafbb4fae update pull split bill Aung Myo 2018-02-09 14:31:34 +06:30
  • 69db4656ba Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-09 14:20:22 +06:30
  • 3774198589 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-09 14:20:11 +06:30
  • 4c563e23bf add shop info in split bill phyusin 2018-02-09 14:19:53 +06:30
  • a62e1bae4c update addorder set price Aung Myo 2018-02-09 14:18:54 +06:30
  • 8cce090566 update addorder set price Aung Myo 2018-02-09 14:13:18 +06:30
  • 9f6505fd95 remove conflict data in ability.rb phyusin 2018-02-09 14:06:16 +06:30
  • c124a5fb77 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-09 14:04:36 +06:30
  • b1323c4165 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-02-09 14:03:49 +06:30
  • 19e9a941c8 show set item price in origami phyusin 2018-02-09 12:07:53 +06:30
  • e7206dbafd update add order for set price Aung Myo 2018-02-09 12:07:37 +06:30
  • 54cb5b0c87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-09 11:32:49 +06:30
  • edade3662b update quickservice Aung Myo 2018-02-09 11:32:29 +06:30
  • a59d692569 remove conflict data in oqs/home_controller.rb San Wai Lwin 2018-02-09 10:20:43 +06:30
  • 860e8db202 conflic data San Wai Lwin 2018-02-09 10:17:56 +06:30
  • 88a3deca30 change ui for split bill phyusin 2018-02-08 18:17:17 +06:30
  • 8f96249c21 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-08 18:11:50 +06:30
  • d42fc485ae change ui for left sidebar phyusin 2018-02-08 18:10:11 +06:30
  • 00d3397834 conflict data remove for order/show.index.html.erb phyusin 2018-02-08 18:04:36 +06:30
  • 2963839d31 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-02-08 17:56:55 +06:30
  • e445b3e88e add order count and change orders UI for table and room phyusin 2018-02-08 17:56:41 +06:30
  • a64fc8a4f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-08 14:46:57 +06:30
  • c4452c2730 update order queue printer for order_summary with before update qty Aung Myo 2018-02-08 14:15:29 +06:30
  • d052fed803 update pay first and print later Aung Myo 2018-02-08 14:13:58 +06:30
  • 5e7a3a2212 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-08 13:12:03 +06:30
  • 420461918d update print summary for before_updated_qty Aung Myo 2018-02-08 13:04:01 +06:30
  • 4c4d11582d update order for pay first print last Aung Myo 2018-02-08 11:58:41 +06:30
  • 8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service Aung Myo 2018-02-08 11:09:21 +06:30
  • 38dc13ecf7 update pending order Aung Myo 2018-02-08 11:08:52 +06:30
  • 2a1c761199 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-08 10:15:13 +06:30
  • 7ae8b44f4b check status in sale payment phyusin 2018-02-08 10:11:05 +06:30
  • 898c05082a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-07 17:49:19 +06:30
  • a2223a6b90 add edit route in oqs detail phyusin 2018-02-07 17:47:04 +06:30
  • c71ece4327 change sale id for add to existing in room phyusin 2018-02-07 15:58:19 +06:30
  • 18eb7677c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-07 15:50:57 +06:30
  • 492bf93185 change split bill ui phyusin 2018-02-07 15:50:36 +06:30
  • 625ee9bd34 For add alert box for Close Cashier San Wai Lwin 2018-02-07 13:23:01 +06:30
  • 7c3cab4109 update origami order Aung Myo 2018-02-07 11:13:18 +06:30
  • 2101089f00 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-02-07 10:52:06 +06:30
  • 0517d66d48 update oqs Aung Myo 2018-02-07 10:51:49 +06:30
  • 41aa840eb2 conflict data phyusin 2018-02-06 18:12:59 +06:30
  • 21538f38f8 order query changed phyusin 2018-02-06 18:06:40 +06:30
  • 503f1df0ab change order data phyusin 2018-02-06 18:05:02 +06:30
  • 7a055470e8 add split bill for order item in room phyusin 2018-02-06 17:46:58 +06:30
  • 4440f16559 update oqs for loading Aung Myo 2018-02-06 17:44:10 +06:30
  • 313bcd5db9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2018-02-06 17:02:44 +06:30
  • d416f788cb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill phyusin 2018-02-06 16:41:37 +06:30
  • 6503ca9a48 update home for oqs Aung Myo 2018-02-06 16:24:00 +06:30