shopapp 0.2.52 → 0.2.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/controllers/concerns/shoplift_client.rb +9 -0
- data/app/helpers/shopapp3_helper.rb +2 -1
- data/shopapp.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a30afca49fda517eafc4b447cb1d129b5e24bd1c0032fc10b72a48417cdfc09d
|
|
4
|
+
data.tar.gz: 9f752cffdac7abd7d8653b92e9a505c8f318102cc7ebc56cedf072f7597f6607
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f3b04d72743747addd710ec30b1bb4badc1ed26262ebc770fff1c7bd63010dcb2dff5357f3e297c683a659198355bbca08441ff094b96bd8cfd9135571c34f2f
|
|
7
|
+
data.tar.gz: f8d37df060088735307f00351a1d8be5f9d1e3f451a97f5c08ae61579e519dce6e5ff83d8fd0952bffb22554a943db39a01d0b9e83eb2c257afc06a1562d4d8c
|
data/README.md
CHANGED
|
@@ -66,4 +66,4 @@ Following creates default remote (zwr/demolift), but does not push:
|
|
|
66
66
|
|
|
67
67
|
To build new version of this gem, change the version in shopapp.gemspec and run:
|
|
68
68
|
|
|
69
|
-
git push; gem build shopapp.gemspec ; gem push shopapp-0.2.
|
|
69
|
+
git push; gem build shopapp.gemspec ; gem push shopapp-0.2.53.gem; gem install shopapp
|
|
@@ -51,6 +51,15 @@ module ShopliftClient
|
|
|
51
51
|
partner[:company] = Company.find_or_create_by! code: partner['code']
|
|
52
52
|
partner[:company].name = partner['name']
|
|
53
53
|
partner[:company].info ||= {}
|
|
54
|
+
|
|
55
|
+
# Very ugly bugfix: investigate how comes this is string in the first place
|
|
56
|
+
if partner[:company].info.is_a? String
|
|
57
|
+
begin
|
|
58
|
+
partner[:company].info = JSON.parse(partner[:company].info)
|
|
59
|
+
rescue
|
|
60
|
+
end
|
|
61
|
+
end
|
|
62
|
+
|
|
54
63
|
partner[:company].info['company_info'] = partner['info']
|
|
55
64
|
partner[:company].save!
|
|
56
65
|
end
|
|
@@ -7,7 +7,8 @@ module Shopapp3Helper
|
|
|
7
7
|
<<~HTML
|
|
8
8
|
<li class="nav-item py-3 #{active}">
|
|
9
9
|
<a class="nav-link d-flex flex-column justify-content-start align-items-center" href="#{sidebar_action[:path]}">
|
|
10
|
-
#{image_tag sidebar_action[:icon], width: '20', class: 'img-fluid'}
|
|
10
|
+
#{image_tag sidebar_action[:icon].to_s, width: '20', class: 'img-fluid' if sidebar_action[:icon].present?}
|
|
11
|
+
#{mdi_tag sidebar_action[:mdi].to_s, class: 'mdi-36px' if sidebar_action[:mdi].present?}
|
|
11
12
|
<label class="text-light mt-2 text-center">#{ sidebar_action[:tooltip]}</label>
|
|
12
13
|
</a>
|
|
13
14
|
</li>
|
data/shopapp.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = 'shopapp'
|
|
3
|
-
s.version = '0.2.
|
|
3
|
+
s.version = '0.2.53'
|
|
4
4
|
s.date = '2019-05-03'
|
|
5
5
|
s.summary = 'Do a shoplift.'
|
|
6
6
|
s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
|