c80_shared 0.1.84 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c350acb1acfe2bb7060d94d485389cffa9094f896e592d3737b1b0548c021d3
-  data.tar.gz: 65251cd254240e4c433a3da1a63dd5a9ba04e05e582d4627512cf677e77bd04a
+  metadata.gz: 302b70eb9a075299310a7cdf997ff1a25400c48e9650edb240bb4c915fc1add0
+  data.tar.gz: 35e696ea03564f3bab6a1d5b366937206c7937e2165a3245caff52c34fb79078
 SHA512:
-  metadata.gz: 33c326147eb7fc1675dbd7a1a9ace65c363f94b5fca91b758c2fdd33c55c2cc18310a896b076ff25b20524cb4e6bdaa63391484ed9b1e609ca3e88401597ffdb
-  data.tar.gz: 7dc082db68c5560341b0364f78973fe9250cd91f2873cc19bc3c8d9204561a61b169f79ffc71dadace2fba1d9f36f3867fb2e731f21ae5fa12a240d28c12a7a2
+  metadata.gz: 945626034ec455457efaa3e8bc7c460526d39d6c241dd3cced31f9f42076c9b93ead3826eb26f1b6498a27de63e94890c07a63fa023f8e7c475fe71995382563
+  data.tar.gz: 0a793903aa2eac4c0d00f52aad2b07dfa50b40ccd7101e6ac3c51bd02598110497aeec962678eb0612c030911d79757abad11099f3ef3aaadedf9cce9f2e268f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    c80_shared (0.1.84)
+    c80_shared (0.1.89)
 
 GEM
   remote: https://rubygems.org/

data/Makefile

@@ -0,0 +1,2 @@
+build:
+	/bin/bash -c "/usr/share/rvm/bin/rvm ruby-2.3.7 do /usr/share/rvm/rubies/ruby-2.3.7/bin/ruby /usr/share/rvm/rubies/ruby-2.3.7/bin/gem build c80_shared.gemspec"

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/dicts/operators.rb

@@ -0,0 +1,7 @@
+# при изменении данного списка необходимо соответственно изменить методы отрисовки кнопок в декораторе ::Lease::Bids::Client::Actions
+module Dicts
+  class Operator < ::Dict
+    STRIPE = new 1, :stripe
+    PAYPAL = new 2, :paypal
+  end
+end

data/app/dicts/request_info_state.rb

@@ -0,0 +1,7 @@
+module Dicts
+  class RequestInfoState < ::Dict
+    CREATED    = new 1, :created
+    SUBMITTING = new 2, :submitting
+    SUCCESS    = new 3, :success
+  end
+end

data/app/serializers/accounts/account_central_agent_serializer.rb

@@ -0,0 +1,25 @@
+module Accounts
+  class CentralAgentSerializer < AbstractSerializer
+    class << self
+      def available_attributes
+        %i[
+          email
+          phone
+          name
+        ]
+      end
+
+      def email(central_agent)
+        { email: central_agent.account.user.email }
+      end
+
+      def phone(central_agent)
+        { phone: central_agent.account.user.phone }
+      end
+
+      def name(central_agent)
+        { name: central_agent.account.user.name }
+      end
+    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
@@ -47,6 +50,7 @@ module Lease
       def boat(bid)
         boat            = bid.boat
         boat_serialized = BoatSerializer.serialize boat, attributes: %i[
+          id
           name
           boat_length
           guests_total
@@ -72,6 +76,36 @@ module Lease
         { price: bid.price }
       end
 
+      def price_percent(bid)
+        { price_percent: bid.price_percent }
+      end
+
+      def cancellation_type(bid)
+        return { cancellation_type: nil } 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/app/serializers/lease/request_info_serializer.rb

@@ -0,0 +1,64 @@
+module Lease
+  class RequestInfoSerializer < ::AbstractSerializer
+    class << self
+      def serialize(model, attributes:, opts: {})
+        super
+      end
+
+      def available_attributes
+        %i[
+          id
+          uuid
+          operator
+          amount
+          currency
+          external_transaction_id
+          state
+          created_at
+          updated_at
+        ]
+      end
+
+      def id(request_info)
+        { id: request_info.id }
+      end
+
+      def uuid(request_info)
+        { uuid: request_info.uuid }
+      end
+
+      def operator(request_info)
+        {
+          operator: {
+            id:    request_info.operator.id,
+            index: request_info.operator.type_index
+          }
+        }
+      end
+
+      def amount(request_info)
+        { amount: request_info.amount }
+      end
+
+      def currency(request_info)
+        { currency: request_info.currency }
+      end
+
+      def external_transaction_id(request_info)
+        { external_transaction_id: request_info.external_transaction_id }
+      end
+
+      def state(request_info)
+        { state: request_info.state }
+      end
+
+      def created_at(request_info)
+        { created_at: request_info.created_at }
+      end
+
+      def updated_at(request_info)
+        { updated_at: request_info.updated_at }
+      end
+    end
+  end
+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.89"
 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.89
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,6 +49,7 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README.md
 - app/dicts/account_type.rb
 - app/dicts/boat_condition.rb
@@ -64,11 +65,14 @@ 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
+- app/dicts/operators.rb
 - app/dicts/reject_type.rb
 - app/dicts/rent_skip_type.rb
+- app/dicts/request_info_state.rb
 - app/dicts/role.rb
 - app/forms/application_form.rb
 - app/forms/rent_form.rb
@@ -87,6 +91,7 @@ files:
 - app/repositories/accounts/client_account_repository.rb
 - app/repositories/events/rejects_repository.rb
 - app/serializers/account_serializer.rb
+- app/serializers/accounts/account_central_agent_serializer.rb
 - app/serializers/boat_location_serializer.rb
 - app/serializers/boat_price_serializer.rb
 - app/serializers/boat_sale_price_serializer.rb
@@ -100,6 +105,7 @@ files:
 - app/serializers/lease/bid_serializer.rb
 - app/serializers/lease/inquiry_serializer.rb
 - app/serializers/lease/rebate_serializer.rb
+- app/serializers/lease/request_info_serializer.rb
 - app/serializers/lib/boats/dimensions.rb
 - app/serializers/lib/boats/rent_price_per_season.rb
 - app/serializers/lib/boats/sale_price.rb
@@ -139,6 +145,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