Commit Graph

110 Commits

Author SHA1 Message Date
yarzar_code
02bd167fe3 changed daily sales report column 2020-09-18 08:51:54 +06:30
Thein Lin Kyaw
b730da7a75 Merge branch 'r-1902001-01' into foodcourt 2020-09-10 10:31:07 +06:30
Thein Lin Kyaw
0254c4be35 fix shift_sales:audit task 2020-09-09 14:26:18 +06:30
Thein Lin Kyaw
7dfcff5af5 fix tasks shop create expiry time 2020-08-31 10:51:00 +06:30
Thein Lin Kyaw
1653df96db update rake task shop create 2020-08-13 14:35:51 +06:30
Thein Lin Kyaw
9f3cd7591f prawn text 2020-07-10 10:22:30 +06:30
Thein Lin Kyaw
b810f15542 update rake create shop 2020-05-30 10:04:15 +06:30
Thein Lin Kyaw
72734c8bff use membership actions for PAYMAL create payment 2020-05-29 21:42:27 +06:30
Thein Lin Kyaw
7c2dd165fc Merge branch 'r-1902001-01' into foodcourt 2020-05-29 13:32:16 +06:30
Thein Lin Kyaw
8bae89eeac update rake shift_sales:audit 2020-05-22 17:28:23 +06:30
Thein Lin Kyaw
e5a27aaac9 update rake task shift_sales:audit 2020-05-20 19:01:55 +06:30
Thein Lin Kyaw
115ed3c06b fix rounding adjustment 2020-05-17 13:55:38 +06:30
Thein Lin Kyaw
af8a3c7a54 generate task shift_sales rake 2020-04-30 18:08:55 +06:30
Thein Lin Kyaw
11ffaa738f update multi_tenancy/license 2020-01-29 14:20:50 +06:30
Thein Lin Kyaw
c8ff92975e fix rake shop:create 2020-01-23 16:30:42 +06:30
Thein Lin Kyaw
117cd39d35 update rake shop:create 2020-01-23 16:27:12 +06:30
Myat Zin Wai Maw
f68a98d5fd Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2020-01-22 14:26:42 +06:30
Myat Zin Wai Maw
fae91f701b tax 2020-01-22 14:26:14 +06:30
Thein Lin Kyaw
0a5aff4c94 update rake task shop:create 2020-01-20 17:22:27 +06:30
Thein Lin Kyaw
0df7357cc9 update rake to shop_create 2020-01-17 15:53:34 +06:30
Myat Zin Wai Maw
91ca3e04ab rake 2020-01-15 11:57:10 +06:30
Myat Zin Wai Maw
d6e0079314 - 2020-01-14 18:09:45 +06:30
Myat Zin Wai Maw
e0e15ac908 rake 2020-01-14 13:17:19 +06:30
Myat Zin Wai Maw
79a04ea998 rake 2020-01-14 11:14:21 +06:30
Nweni
417d64ecae fixed conflict after merch dev for current shop 2019-12-02 19:30:24 +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
phyusin
2d36221c33 change consolidate receipt rake file 2018-11-16 17:11:21 +06:30
phyusin
01473bffbd consolidate receipt data 2018-11-16 16:30:18 +06:30
Aung Myo
87502ec0f2 update inventory and shop and seed 2018-10-09 16:12:52 +06:30
Aung Myo
ddae25b241 Merge branch 'adminbsb_material_ui' 2018-07-17 13:14:03 +06:30
Aung Myo
26f4715aed update dining charge for before block 2018-07-17 13:13:04 +06:30
phyusin
416e7c19f3 check seedd generator for commission issue 2018-07-16 10:17:02 +06:30
phyusin
da1f0a4765 add expiry for login 2018-06-26 11:23:34 +06:30
phyusin
5b8b471b30 change seed 2018-06-11 14:37:04 +06:30
Aung Myo
6d6d90050f update commission && report 2018-05-24 14:03:49 +06:30
phyusin
52a6d13041 Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-25 15:43:01 +06:30
phyusin
172c2136cc add order reservation in clear data 2018-04-25 15:40:57 +06:30
Aung Myo
cc89a35ece update rake receipt 2018-04-22 10:45:29 +06:30
Aung Myo
ba1b7a1d9c update receipt rake 2018-04-20 18:11:32 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Aung Myo
652251f243 update rake file 2018-04-19 15:00:48 +06:30
Aung Myo
635db2e011 update rake receipt file 2018-04-19 13:59:50 +06:30
phyusin
9d9a07b100 change clear data 2018-04-03 12:59:33 +06:30
Aung Myo
fd12af244d update menu import and export 2018-03-20 17:42:19 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Yan
87a27250b7 fix minus addorder.js and void and other origami 2017-11-26 22:23:37 +06:30
Yan
97fd7619ce license test 2017-11-10 18:08:48 +06:30
Yan
a569e9b5a2 add is_currently_login true in clear data 2017-11-01 10:11:41 +06:30