c80_shared 0.1.85 → 0.1.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed5f35d3ff5e11a40541cc2822ae35609f9b1f910959ad86c6e69af57f3b6b2
-  data.tar.gz: b46e0e82e3d67048dafddf52fbe5c79a4807b487b83c5b7f9052020793bd33c8
+  metadata.gz: 8b74798e7fa2ba84239918bc247e89ceca53912539ae784d14ba6556c0ba13a1
+  data.tar.gz: b6123aae96bf2611736b5005b2459da881e906e8a9476d067229e975cd00fa1c
 SHA512:
-  metadata.gz: 181ca579be539a73581cced8dc9db63fb0253017352df93dd6508e5990a8981844e1554a398f1f6bbf9a0d8f9d7147aacf6635d0e563a075fd345be202204df5
-  data.tar.gz: 6ec6e7728b432120edcac45ee5f6c189890e008c5d10204505d3c8ab89dc965d85afc8e898efe5923427ec3c9aae81a8b7ef3b77b0916e1e8701e5ee613db100
+  metadata.gz: e6ccb76fbbd4df0cf0297c821711e79dd9e3059cb61fad4b20d379244e4937eef719acd1f1c59908f5a0fff595821def85b0b8f18422bce1c011034c8cd5cee1
+  data.tar.gz: 9fb4506fab81c11b4ccd8b4fa96a19251c5f39767f187c19b177ff9277fb8ccc97cb289b4566dda9e916ffa894640fd2473140e5c6e03cb3e295f30a248794f8

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/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/account_serializer.rb

@@ -7,6 +7,7 @@ class AccountSerializer < AbstractSerializer
         id
         type_index
         props
+        abilities
       ]
     end
 
@@ -38,5 +39,23 @@ class AccountSerializer < AbstractSerializer
               end
       { props: props }
     end
+
+    # список возможностей с учётом запретов
+    def abilities(account)
+      account_class     = ::Dictionaries::AccountType::CLASS_BY_TYPE[account.type_id]
+      default_abilities = ::Dicts::Accounts::Ability.all_for_account_class(account_class)
+      prohibited        = account.user.permissions
+
+      # отнимаем запрещённые действия из дефолтных
+      not_prohibited = ->(ability) { prohibited.none? { |a| a.action.to_s == ability.index.to_s } }
+      abilities      = default_abilities.map do |a|
+        {
+          action: a.index,
+          can:    not_prohibited[a]
+        }
+      end
+
+      { abilities: abilities }
+    end
   end
-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

@@ -80,7 +80,7 @@ module Lease
       end
 
       def cancellation_type(bid)
-        return if bid.cancellation_type.nil?
+        return { cancellation_type: nil } if bid.cancellation_type.nil?
 
         ct = ::Dicts::Lease::OfferCancelation.find bid.cancellation_type
 

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/lib/c80_shared/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.85
+  version: 0.1.90
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-06-07 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
@@ -68,8 +69,10 @@ files:
 - 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
@@ -88,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
@@ -101,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
@@ -201,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.