spree_cm_commissioner 2.0.2.pre.pre → 2.0.3.pre.pre
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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c3a09bcc91fdaec54ad8514c242efe83109f6e361f4afa843ad4c8fdd04ca7c7
|
|
4
|
+
data.tar.gz: d302883898e3dd6fe75a6021be5313e31178cf8557d41a76966ce5f7fea22056
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e864e312cf23fc7fffc23f3767abafe3e40ac399c078daefe6d169ac3003cff5a0c2d03880ec2485bffe6c834460bc374a781b928daffae448877ab0643ea4ed
|
|
7
|
+
data.tar.gz: 6a036dac2ca9648753ee544e53db906b84e08c84bab8203b84b492c99e93adb03ba8e5e0343f1c9a8b9834a98c2f03348ccfe0e1b453f704f333308165acc4cc
|
data/Gemfile.lock
CHANGED
|
@@ -11,7 +11,7 @@ module SpreeCmCommissioner
|
|
|
11
11
|
belongs_to :seat_section, class_name: 'SpreeCmCommissioner::SeatSection', optional: true
|
|
12
12
|
belongs_to :seat_layout, class_name: 'SpreeCmCommissioner::SeatLayout', optional: false
|
|
13
13
|
|
|
14
|
-
validates :label, presence: true, if:
|
|
14
|
+
validates :label, presence: true, if: :label_required?
|
|
15
15
|
|
|
16
16
|
has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
|
|
17
17
|
has_many :variants, class_name: 'Spree::Variant', through: :variant_blocks
|
|
@@ -24,8 +24,12 @@ module SpreeCmCommissioner
|
|
|
24
24
|
|
|
25
25
|
before_validation :assign_layout_from_section, if: -> { seat_layout.nil? && seat_section.present? }
|
|
26
26
|
|
|
27
|
+
def label_required?
|
|
28
|
+
seatable? || block_type.to_s == 'other'
|
|
29
|
+
end
|
|
30
|
+
|
|
27
31
|
def self.seatable?(block_type)
|
|
28
|
-
block_type.in?(%w[sleeping_seat seat])
|
|
32
|
+
block_type.to_s.in?(%w[sleeping_seat seat])
|
|
29
33
|
end
|
|
30
34
|
|
|
31
35
|
def seatable?
|