Commit Graph

135 Commits

Author SHA1 Message Date
yarzar_code
dff2c69627 Read NFC 2020-01-12 20:07:28 +06:30
NyanLinHtut
314cc507a3 merge with r-19 2020-01-11 11:08:33 +06:30
Myat Zin Wai Maw
79598c0126 shop code 2019-12-10 15:18:48 +06:30
Thein Lin Kyaw
3a99e1bb09 update for order process
Add activereocrd-import gem for bulk insert
2019-12-09 10:33:19 +06:30
Myat Zin Wai Maw
b0f6368248 shop_code 2019-12-05 14:56:47 +06:30
Nweni
417d64ecae fixed conflict after merch dev for current shop 2019-12-02 19:30:24 +06:30
Thein Lin Kyaw
1607cb70d3 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.

config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'

ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more detail: https://github.com/ErwinM/acts_as_tenant
2019-12-02 18:02:39 +06:30
Thein Lin Kyaw
937f40e7c1 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.
config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'
ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more details: https://github.com/ErwinM/acts_as_tenant
2019-12-02 17:19:28 +06:30
Nweni
d41d957688 fixed conflict after merge with dev 2019-11-28 16:47:12 +06:30
Myat Zin Wai Maw
d1ab2c194d shop code 2019-11-22 18:24:02 +06:30
Zoey
b7368314c5 print receipt bill 2019-07-03 13:49:54 +06:30
NyanLinHtut
038d6930d9 fixed cancel order print 2019-06-04 18:46:58 +06:30
NyanLinHtut
9defd9cddd add lookup setting for quickservice add order btn 2019-06-04 10:38:39 +06:30
NyanLinHtut
2e342d7859 fixed star printer setting 2019-06-03 10:59:16 +06:30
Aung Myo
ffca0af445 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-09-11 16:43:43 +06:30
Aung Myo
1dee84d733 update oqs and add to extisting 2018-09-11 15:30:43 +06:30
phyusin
70143033e7 edit oqs data 2018-09-11 13:22:48 +06:30
Aung Myo
8d1ca45f30 update oqs 2018-09-10 18:39:10 +06:30
Aung Myo
430d5eaa7a update oqs update 2018-09-10 14:19:20 +06:30
San Wai Lwin
d1852d24c3 Pull from master 2018-08-20 11:26:07 +06:30
Aung Myo
ba8c723c17 update oqs employee and oqs station 2018-08-14 17:21:06 +06:30
San Wai Lwin
d076e50cdb Edit Order item unmatch 2018-07-04 15:22:39 +06:30
phyusin
c4cefb05ae conflict data 2018-05-28 10:46:04 +06:30
EikhantMon
7ddbd7d78a conflit modified changes 2018-05-25 17:44:36 +06:30
San Wai Lwin
3c8e3c5326 Add Order Set Pdf 2018-05-25 17:06:45 +06:30
EikhantMon
6c26dc4d5a item_slim_customise_pdf 2018-05-25 16:23:24 +06:30
San Wai Lwin
f906134fbf Remove lookup settings in Order Pdf 2018-05-25 16:06:10 +06:30
San Wai Lwin
d910c4078b Add Order item & summary customise font pdf 2018-05-24 17:02:54 +06:30
Aung Myo
95faa6fdb4 update edit controller for update qty without assigne items 2018-05-16 13:54:14 +06:30
San Wai Lwin
8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန 2018-05-14 15:31:00 +06:30
phyusin
760c7685df fixed some issue 2018-05-11 11:59:30 +06:30
San Wai Lwin
caa0180e8c Edit UI design and table in OQS 2018-05-02 17:55:53 +06:30
San Wai Lwin
e3b2fee46e Change table view in OQS 2018-05-02 15:10:58 +06:30
Aung Myo
a9b9342f42 Merge branch 'adminbsb_material_ui' 2018-04-07 16:45:45 +06:30
Aung Myo
14b33a6f8d add kitchen role for oqs 2018-04-07 15:53:24 +06:30
phyusin
d29b7a9d49 change update order item func: 2018-04-03 14:15:35 +06:30
phyusin
56870f94b0 add booking data 2018-03-28 17:12:43 +06:30
phyusin
bf84392ef8 SQA feedback 2018-03-19 19:34:34 +06:30
phyusin
e55ff8b5e0 SQA feedback 2018-03-19 09:17:12 +06:30
phyusin
c7f11c2a33 fixed set menu item update and individual payment 2018-03-15 11:15:43 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
phyusin
5523ff6fc1 check product sale report 2018-02-26 11:24:47 +06:30
phyusin
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +06:30
phyusin
06abf1c744 check oqs edit in origami 2018-02-22 19:18:24 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
San Wai Lwin
a59d692569 remove conflict data in oqs/home_controller.rb 2018-02-09 10:20:43 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30