c80_shared 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84795cb065e618a232fb00682c7c86e72b75a711e95a0775a38efeef30760c0
-  data.tar.gz: 97291d1a16b348ac5282c0c4076c3fc1272eef290b421ed162eaf48ea4a6b66e
+  metadata.gz: cde6b4910035f561acdab26049ac39873c785e174d5034c163c16dc62eed9b61
+  data.tar.gz: 899f3df15035dee6aff913d48f649ccf867b2fca941e985b07574d3e9b3cfc28
 SHA512:
-  metadata.gz: '0854fbb3a527864d20de902e31271f89caeedfa4aa7abe76399b8f1b049a8a1a45587afbf3535fb2581eb050e6ce2cef26f0051e088d2092465f94a1fa5c7dcf'
-  data.tar.gz: 2c940900cb0c71603daa845b47ff8188be748c009ae6f3d41b064bae9690fb3cbaa4b5b2c3888b3f77079a66d32884c8237ec98b94ed65de133d7848b49b3252
+  metadata.gz: 9e03ea2c8a4e2bb41666cdbdfb49055f8cbfb5827ccc05834c693e1f0564f7707a561f3f5d6bfb335d92a791376376c43d2e8878ac09689228af6f2fc68160d4
+  data.tar.gz: 607dae99f944d8ffa3be82ece28befbab975caade25b3d791d2c91b21a8745d0f415355f01b664837883498b58015ab915d2948bb6e49fe084d959a89ff166d7

data/app/serializers/boat_serializer.rb

@@ -20,27 +20,35 @@ class BoatSerializer < AbstractSerializer
         boat_type_id
         builder
         built_year
+        charter_1_day_high_discount
         charter_1_day_high_eur
         charter_1_day_high_rub
         charter_1_day_high_usd
+        charter_1_day_low_discount
         charter_1_day_low_eur
         charter_1_day_low_rub
         charter_1_day_low_usd
+        charter_1_hour_high_discount
         charter_1_hour_high_eur
         charter_1_hour_high_rub
         charter_1_hour_high_usd
+        charter_1_hour_low_discount
         charter_1_hour_low_eur
         charter_1_hour_low_rub
         charter_1_hour_low_usd
+        charter_1_month_high_discount
         charter_1_month_high_eur
         charter_1_month_high_rub
         charter_1_month_high_usd
+        charter_1_month_low_discount
         charter_1_month_low_eur
         charter_1_month_low_rub
         charter_1_month_low_usd
+        charter_1_week_high_discount
         charter_1_week_high_eur
         charter_1_week_high_rub
         charter_1_week_high_usd
+        charter_1_week_low_discount
         charter_1_week_low_eur
         charter_1_week_low_rub
         charter_1_week_low_usd
@@ -63,6 +71,7 @@ class BoatSerializer < AbstractSerializer
         price
         price_discount
         refit_year
+        sale_price_discount
         sale_price_eur
         sale_price_rub
         sale_price_usd
@@ -111,7 +120,6 @@ class BoatSerializer < AbstractSerializer
       { name_builder: arr * ' ' }
     end
 
-
     # noinspection RubyResolve
     def picture_medium_url(boat)
       url = if boat.boat_photo.present?
@@ -128,7 +136,7 @@ class BoatSerializer < AbstractSerializer
     end
 
     def motor(boat)
-      { motor: boat.motor }
+      { motor: boat.motor || '' }
     end
 
     def main_boat_photo_id(boat)
@@ -189,7 +197,7 @@ class BoatSerializer < AbstractSerializer
     end
 
     def hull_material(boat)
-      { hull_material: boat.hull_material }
+      { hull_material: boat.hull_material || '' }
     end
 
     def crew_total(boat)
@@ -274,10 +282,9 @@ class BoatSerializer < AbstractSerializer
     end
 
     def boat_hull_id(boat)
-      { boat_hull_id: boat.boat_hull_id }
+      { boat_hull_id: boat.boat_hull_id || '' }
     end
 
-
     # --[low]-----------------------------------------------------------------------------------------------------------
 
     def charter_1_hour_low_usd(boat)
@@ -392,6 +399,44 @@ class BoatSerializer < AbstractSerializer
       { sale_price_eur: boat.sale_price_eur || '' }
     end
 
+    # --[discount]------------------------------------------------------------------------------------------------------
+
+    def charter_1_day_high_discount(boat)
+      { charter_1_day_high_discount: boat.charter_1_day_high_discount }
+    end
+
+    def charter_1_day_low_discount(boat)
+      { charter_1_day_low_discount: boat.charter_1_day_low_discount }
+    end
+
+    def charter_1_hour_high_discount(boat)
+      { charter_1_hour_high_discount: boat.charter_1_hour_high_discount }
+    end
+
+    def charter_1_hour_low_discount(boat)
+      { charter_1_hour_low_discount: boat.charter_1_hour_low_discount }
+    end
+
+    def charter_1_month_high_discount(boat)
+      { charter_1_month_high_discount: boat.charter_1_month_high_discount }
+    end
+
+    def charter_1_month_low_discount(boat)
+      { charter_1_month_low_discount: boat.charter_1_month_low_discount }
+    end
+
+    def charter_1_week_high_discount(boat)
+      { charter_1_week_high_discount: boat.charter_1_week_high_discount }
+    end
+
+    def charter_1_week_low_discount(boat)
+      { charter_1_week_low_discount: boat.charter_1_week_low_discount }
+    end
+
+    def sale_price_discount(boat)
+      { sale_price_discount: boat.sale_price_discount }
+    end
+
     def state(boat)
       { state: boat.state }
     end
@@ -400,6 +445,7 @@ class BoatSerializer < AbstractSerializer
       # FIXME:: выяснить, нужно ли всётаки использовать .gsub('\'', '&#39;') для строк с путями к фоткам?
       boat_photos = boat.boat_photos.map do |boat_photo|
         {
+          id:           boat_photo.id,
           gallery_path: boat_photo.picture.url(:gallery),
           medium_path:  boat_photo.picture.url(:medium),
           thumb_path:   boat_photo.picture.url(:thumb)

data/app/serializers/configs/boats/boat_prices_discount.rb

@@ -0,0 +1,31 @@
+module Configs
+  module Boats
+    class BoatPricesDiscount
+      #
+      # список атрибутов лодки, в которых указана скидка в процентах
+      #
+      def self.attributes(price_attributes = ::Dictionaries::BoatCharterAttribute::ALL)
+        # собираем имена вида: charter_1_hour_high_discount,...
+        attributes = []
+        price_attributes.map do |attr|
+          field = '%s_discount' % attr
+          next unless field
+
+          attributes << field.to_sym
+        end
+
+        # особняком добавляем имя атрибута sale_price_discount
+        field = '%s_discount' % :sale_price
+        attributes << field.to_sym
+
+        if block_given?
+          attributes.each do |attribute|
+            yield attribute
+          end
+        else
+          attributes
+        end
+      end
+    end
+  end
+end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ files:
 - app/serializers/boat_serializer.rb
 - app/serializers/boat_visit_day_serializer.rb
 - app/serializers/configs/boats/boat_prices.rb
+- app/serializers/configs/boats/boat_prices_discount.rb
 - app/serializers/configs/boats/central_agent/boat_list.rb
 - app/serializers/configs/lease/central_agent/inquiry_list.rb
 - app/serializers/lease/bid_serializer.rb