c80_shared 0.1.84 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c350acb1acfe2bb7060d94d485389cffa9094f896e592d3737b1b0548c021d3
-  data.tar.gz: 65251cd254240e4c433a3da1a63dd5a9ba04e05e582d4627512cf677e77bd04a
+  metadata.gz: 9ed5f35d3ff5e11a40541cc2822ae35609f9b1f910959ad86c6e69af57f3b6b2
+  data.tar.gz: b46e0e82e3d67048dafddf52fbe5c79a4807b487b83c5b7f9052020793bd33c8
 SHA512:
-  metadata.gz: 33c326147eb7fc1675dbd7a1a9ace65c363f94b5fca91b758c2fdd33c55c2cc18310a896b076ff25b20524cb4e6bdaa63391484ed9b1e609ca3e88401597ffdb
-  data.tar.gz: 7dc082db68c5560341b0364f78973fe9250cd91f2873cc19bc3c8d9204561a61b169f79ffc71dadace2fba1d9f36f3867fb2e731f21ae5fa12a240d28c12a7a2
+  metadata.gz: 181ca579be539a73581cced8dc9db63fb0253017352df93dd6508e5990a8981844e1554a398f1f6bbf9a0d8f9d7147aacf6635d0e563a075fd345be202204df5
+  data.tar.gz: 6ec6e7728b432120edcac45ee5f6c189890e008c5d10204505d3c8ab89dc965d85afc8e898efe5923427ec3c9aae81a8b7ef3b77b0916e1e8701e5ee613db100

data/app/dicts/lease/offer_cancelation.rb

@@ -0,0 +1,12 @@
+#https://makandracards.com/makandra/52455-rails-including-html-in-your-i18n-locales
+#
+module Dicts
+  module Lease
+    class OfferCancelation < ::Dict
+      FLEXIBLE     = new 1, :flexible
+      STANDARD     = new 2, :standard
+      STRICT       = new 3, :strict
+      SUPER_STRICT = new 4, :super_strict
+    end
+  end
+end

data/app/serializers/lease/bid_serializer.rb

@@ -15,6 +15,9 @@ module Lease
           boat_id
           boat
           price
+          price_percent
+          cancellation_type
+          human_payment_prices
           currency
           state
           from
@@ -72,6 +75,36 @@ module Lease
         { price: bid.price }
       end
 
+      def price_percent(bid)
+        { price_percent: bid.price_percent }
+      end
+
+      def cancellation_type(bid)
+        return if bid.cancellation_type.nil?
+
+        ct = ::Dicts::Lease::OfferCancelation.find bid.cancellation_type
+
+        { cancellation_type: {
+                id:        ct.id,
+                title:     I18n.t('lease.offer_cancelation.%s.title'     % ct.index),
+                short:     I18n.t('lease.offer_cancelation.%s.short'     % ct.index),
+                full_html: I18n.t('lease.offer_cancelation.%s.full_html' % ct.index)
+            }
+        }
+      end
+
+      def human_payment_prices(bid)
+        if bid.price.present? && bid.price_percent.present?
+          first_price = bid.price * bid.price_percent / 100
+          {
+              human_payment_prices: {
+                  first_payment: num_to_cur(first_price, bid.currency, @opts[:locale]),
+                  second_payment: num_to_cur((bid.price - first_price), bid.currency, @opts[:locale])
+              }
+          }
+        end
+      end
+
       def currency(bid)
         { currency: bid.currency }
       end

data/config/locales/dicts/offer_cancelation/en.yml

@@ -0,0 +1,34 @@
+en:
+  lease:
+    offer_cancelation:
+      :flexible:
+        title: Flexible
+        short: free cancellation up to 24 hours of trip start date
+        full_html: '<ul><li>Cancellations within 24 hours of trip start date are non-refundable;</li>
+                        <li>Refund 100% of the rental price if cancelled more than 24 hours prior to commencement of the rental;</li>
+                        <li>No refund at all of the rental price if cancelled within 24 hours of commencement of the rental.</li>
+                    </ul>'
+      :standard:
+        title: Standard
+        short: no refund during cancellation less than 1 week prior to charter
+        full_html: '<ul>
+                      <li>Refund 100% of the rental price if cancelled more than 7 days prior to commencement of the rental;</li>
+                      <li>50% refund for cancellations within 2-6 days of trip star date;</li>
+                      <li>Cancellations within 2 days of trip start date are non-refundable</li>
+                    </ul>'
+
+      :strict:
+        title: Strict
+        short: free cancellation up to 30 days of the trip start date
+        full_html: '<ul>
+                      <li>50% refund for cancellations within 14-30 days of trip start date;</li>
+                      <li>Cancellations within 14 days of trip start date are non-refundable;</li>
+                    </ul>'
+      :super_strict:
+        title: Super Strict
+        short: '&nbsp;'
+        full_html: '<ul>
+                      <li>In case of cancellation between 3 to 2 months before embarkation, a cancellation fee of 30% will be kept;</li>
+                      <li>In case of cancellation between 2 months to 40 days before embarkation, a cancellation fee of 50% will be kept;</li>
+                      <li>In case of cancellation between 40 days and embarkation, total charter fee will be kept.</li>
+                    </ul>'

data/config/locales/dicts/offer_cancelation/ru.yml

@@ -0,0 +1,34 @@
+ru:
+  lease:
+    offer_cancelation:
+      :flexible:
+        title: Flexible
+        short: free cancellation up to 24 hours of trip start date
+        full_html: '<ul><li>Cancellations within 24 hours of trip start date are non-refundable;</li>
+                        <li>Refund 100% of the rental price if cancelled more than 24 hours prior to commencement of the rental;</li>
+                        <li>No refund at all of the rental price if cancelled within 24 hours of commencement of the rental.</li>
+                    </ul>'
+      :standard:
+        title: Standard
+        short: no refund during cancellation less than 1 week prior to charter
+        full_html: '<ul>
+                      <li>Refund 100% of the rental price if cancelled more than 7 days prior to commencement of the rental;</li>
+                      <li>50% refund for cancellations within 2-6 days of trip star date;</li>
+                      <li>Cancellations within 2 days of trip start date are non-refundable</li>
+                    </ul>'
+
+      :strict:
+        title: Strict
+        short: free cancellation up to 30 days of the trip start date
+        full_html: '<ul>
+                      <li>50% refund for cancellations within 14-30 days of trip start date;</li>
+                      <li>Cancellations within 14 days of trip start date are non-refundable;</li>
+                    </ul>'
+      :super_strict:
+        title: Super Strict
+        short: '&nbsp;'
+        full_html: '<ul>
+                      <li>In case of cancellation between 3 to 2 months before embarkation, a cancellation fee of 30% will be kept;</li>
+                      <li>In case of cancellation between 2 months to 40 days before embarkation, a cancellation fee of 50% will be kept;</li>
+                      <li>In case of cancellation between 40 days and embarkation, total charter fee will be kept.</li>
+                    </ul>'

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.84"
+  VERSION = "0.1.85"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.84
+  version: 0.1.85
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - app/dicts/exterior_color.rb
 - app/dicts/fuel_type.rb
 - app/dicts/hull_material.rb
+- app/dicts/lease/offer_cancelation.rb
 - app/dicts/length.rb
 - app/dicts/locale.rb
 - app/dicts/motor.rb
@@ -139,6 +140,8 @@ files:
 - config/locales/dicts/length/ru.yml
 - config/locales/dicts/motor/en.yml
 - config/locales/dicts/motor/ru.yml
+- config/locales/dicts/offer_cancelation/en.yml
+- config/locales/dicts/offer_cancelation/ru.yml
 - config/locales/dicts/rental_type/en.yml
 - config/locales/dicts/rental_type/ru.yml
 - config/locales/lease/bid.en.yml