c80_shared 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6deb84a52d6a6dc93858a56c1c86533e119940d29d42e3e249c6c0ddf625e06f
-  data.tar.gz: c77b17bd5c63867036ebacf04093ebf51e0048b01b6eaa71df3292e479b4e84f
+  metadata.gz: ab60ae319ce4abda842e353e0cad39fa295bc88096e214cc7a3d86850f4d3087
+  data.tar.gz: d10e052afbc0877695637471f02ce8bc44a19dfff3ea2574ace257e7423ac11f
 SHA512:
-  metadata.gz: 217ee99e49fdab5820a6c693bf28542e1098899c2974d48329c358bbb37d54332aace30c3438e161ce92f827e9beae2d4004a31bd19dd9bca304531e34c3316d
-  data.tar.gz: 9a71b09423edf3f2de57230013b07165d8839a6939b2545aa21f61f42db82080e79ac1c6d45d807f4ba27ee8bb0eb9b245ed0afe755921e6065d7ed17591d3ec
+  metadata.gz: bcf6825cf48b47fb057cf19bbed53905bc95ea41a154561150ea1db176d748ce9e7ac22a3ea3d7f6574a6b33372004df0af917a1c4e443866acb3ee169954418
+  data.tar.gz: a82ee96f349039cd1e772b511e78088b574b4ca0fc4263bc1028c2070836db9318fb4e0d35a89c1c2bfcdcdbe83a90717aba88e6f400efdc412b8d68bcc7e9fe

data/app/dicts/boat_type.rb

@@ -0,0 +1,11 @@
+module Dicts
+  class BoatType < ::Dict
+    BOAT_30FT     = new(4, 'boat_30ft')
+    PARTY_BOAT    = new(7, 'party_boat')
+    YACHT         = new(8, 'yacht')
+    FISHING_BOAT  = new(10, 'fishing_boat')
+    SAILING       = new(11, 'sailing')
+    CATAMARAN     = new(12, 'catamaran')
+    MEGA_YACHT    = new(13, 'mega_yacht')
+  end
+end

data/app/dicts/business.rb

@@ -0,0 +1,6 @@
+module Dicts
+  class Business < ::Dict
+    RENT = new(1, 'rent')
+    SALE = new(1, 'sale')
+  end
+end

data/app/dicts/charter_season.rb

@@ -0,0 +1,8 @@
+module Dicts
+  class CharterSeason < ::Dict
+    LOW  = new(1, 'low')
+    HIGH = new(2, 'high')
+
+    ALL  = [ LOW, HIGH ]
+  end
+end

data/app/dicts/charter_uom.rb

@@ -0,0 +1,10 @@
+module Dicts
+  class CharterUom < ::Dict
+    HOUR  = new(1, 'hour')
+    DAY   = new(2, 'day')
+    WEEK  = new(3, 'week')
+    MONTH = new(4, 'month')
+
+    ALL = [ HOUR, DAY, WEEK, MONTH ]
+  end
+end

data/app/dicts/currency.rb

@@ -1,7 +1,71 @@
 module Dicts
   class Currency < ::Dict
-    USD = new(1, 'USD')
-    EUR = new(2, 'EUR')
-    RUB = new(3, 'RUB')
+    attr_reader :symbol
+
+    def initialize(id, index, symbol)
+      @symbol = symbol
+      super(id, index)
+    end
+
+    AED = new(17, 'AED', "\u062f.\u0625.")
+    ARS = new(9, 'ARS',  "$")
+    AUD = new(7, 'AUD',  "$")
+    BGN = new(11, 'BGN', "lev")
+    BHD = new(10, 'BHD', "\u062f.\u0628.")
+    BRL = new(12, 'BRL', "R$")
+    CAD = new(25, 'CAD', "$")
+    CHF = new(47, 'CHF', "\u20a3")
+    CLP = new(45, 'CLP', "$")
+    CNY = new(6, 'CNY',  "\uffe5")
+    COP = new(27, 'COP', "$")
+    CZK = new(44, 'CZK', "K\u010d")
+    DKK = new(16, 'DKK', "kr.")
+    EGP = new(19, 'EGP', "\u062c.\u0645.")
+    EUR = new(2, 'EUR',  "\u20ac")
+    FJD = new(18, 'FJD', "FJ$")
+    GBP = new(4, 'GBP',  "\u00a3")
+    HKD = new(14, 'HKD', "$")
+    HUF = new(13, 'HUF', "Ft")
+    IDR = new(22, 'IDR', "Rp")
+    ILS = new(20, 'ILS', "\u20aa")
+    INR = new(21, 'INR', "\u20b9")
+    JOD = new(23, 'JOD', "\u062f.\u0627.")
+    JPY = new(50, 'JPY', "\u00a5")
+    KRW = new(49, 'KRW', "\u20a9")
+    KWD = new(28, 'KWD', "\u062f.\u0643.")
+    KZT = new(24, 'KZT', "\u0422")
+    MDL = new(31, 'MDL', "lei")
+    MXN = new(30, 'MXN', "$")
+    MYR = new(29, 'MYR', "RM")
+    NAD = new(32, 'NAD', "N$")
+    NOK = new(35, 'NOK', "kr")
+    NZD = new(33, 'NZD', "$")
+    OMR = new(36, 'OMR', "\u0631.\u0639.")
+    PLN = new(37, 'PLN', "z\u0142")
+    QAR = new(26, 'QAR', "\u0631.\u0642.")
+    RON = new(34, 'RON', "lei")
+    RUB = new(3, 'RUB',  "\u20bd")
+    SAR = new(38, 'SAR', "\u0631.\u0633.")
+    SEK = new(46, 'SEK', "kr")
+    SGD = new(39, 'SGD', "$")
+    THB = new(5, 'THB',  "\u0e3f")
+    TRY = new(41, 'TRY', "TL")
+    TWD = new(40, 'TWD', "NT$")
+    UAH = new(42, 'UAH', "\u20B4")
+    USD = new(1, 'USD',  "$")
+    ZAR = new(48, 'ZAR', "R")
+
+    # старый
+    ALL  = [USD, EUR, RUB]
+
+    # новый
+    ALL2 = [USD,EUR,THB,ARS,AUD,BGN,BHD,
+            BRL,CAD,CHF,CLP,CNY,COP,
+            CZK,DKK,EGP,FJD,GBP,
+            HKD,HUF,IDR,ILS,INR,JOD,
+            JPY,KRW,KWD,KZT,MDL,MXN,
+            MYR,NAD,NOK,NZD,OMR,PLN,
+            QAR,RON,RUB,SAR,SEK,SGD,
+            TRY,TWD,UAH,AED,ZAR]
   end
 end

data/app/dicts/length.rb

@@ -0,0 +1,6 @@
+module Dicts
+  class Length < ::Dict
+    METRE = new(1, 'meters')
+    FOOT  = new(1, 'ft')
+  end
+end

data/app/helpers/custom/select_helper.rb

@@ -10,7 +10,11 @@ module Custom
     def collection_for_select(collection, name, id, options = {})
       return [] unless collection.is_a?(Array)
 
-      collection = collection.map { |h| [ h[name], h[id] ] }
+      collection = if options[:collection_is_not_hash]
+                     collection.map { |h| [ h.try(name), h.try(id) ] }
+                   else
+                     collection.map { |h| [ h[name], h[id] ] }
+                   end
       collection = options_for_select(collection, options[:value]) if options[:options_for_select].present?
       collection
     end

data/app/helpers/site/time_helper.rb

@@ -8,20 +8,20 @@ module Site
     # Вернёт отформатированную строку с датой ~ от локали.
     # @param with_time [Boolean] Если true - вернёт и время
     #
-    def format_date(date, locale = :en, with_time = false)
-      date.strftime locale_date_format(locale, with_time)
+    def format_date(date, locale = :en, with_time = false, with_html = false)
+      date.strftime locale_date_format(locale, with_time, with_html)
     end
 
     # В зависимости от локали выдаст соответствующий формат для отображения дат.
     # https://en.wikipedia.org/wiki/Date_format_by_country
     # @param with_time [Boolean] Если true - вернёт и время
     #
-    def locale_date_format(locale = :en, with_time = false)
+    def locale_date_format(locale = :en, with_time = false, with_html = false)
       res = case locale.to_s
               when 'en'
-                '%Y/%m/%d'
+                with_html ? '<span class="year">%Y</span>/<span class="month">%m</span>/<span class="day">%d</span>' : '%Y/%m/%d'
               when 'ru'
-                '%d.%m.%Y'
+                '<span class="day">%d</span>.<span class="month">%m</span>.<span class="year">%Y</span>'
               else
                 '%Y/%m/%d'
             end

data/app/serializers/boat_price_serializer.rb

@@ -0,0 +1,58 @@
+class BoatPriceSerializer < AbstractSerializer
+
+  class << self
+    def available_attributes
+      %i[season uom duration currency value discount]
+    end
+
+    def season(boat_price)
+      {
+          season: {
+              id:     boat_price.season_id,
+              index:  ::Dicts::CharterSeason.find(boat_price.season_id).index
+          }
+      }
+    end
+
+    # час, день, неделя, месяц
+    def uom(boat_price)
+      {
+          uom: {
+              id:    boat_price.uom_id,
+              index: ::Dicts::CharterUom.find(boat_price.uom_id).index
+          }
+      }
+    end
+
+    def duration(boat_price)
+      { duration: boat_price.duration }
+    end
+
+    def currency(boat_price)
+      bp = ::Dicts::Currency.find(boat_price.currency_id)
+
+      {
+          currency: {
+              id:     bp.id,
+              index:  bp.index,
+              symbol: bp.symbol
+          }
+      }
+    end
+
+    # цена за указанный период
+    def value(boat_price)
+      { value: sprintf('%d', boat_price.value) }
+    end
+
+    def discount(boat_price)
+      { discount: sprintf('%.2f', boat_price.discount) }
+    end
+
+    # TODO:: прояснить надобность, проработать тему
+    def is_orig(boat_price)
+      { is_orig: boat_price.is_orig }
+    end
+
+  end
+end

data/app/serializers/boat_sale_price_serializer.rb

@@ -0,0 +1,33 @@
+class BoatSalePriceSerializer < AbstractSerializer
+
+  class << self
+    def available_attributes
+      %i[id currency value discount]
+    end
+
+    def id(sale_price)
+      { id: sale_price.id }
+    end
+
+    def currency(sale_price)
+      currency = ::Dicts::Currency.find(sale_price.currency_id)
+
+      {
+          currency: {
+              id:     currency.id,
+              index:  currency.index,
+              symbol: currency.symbol
+          }
+      }
+    end
+
+    # цена за указанный период
+    def value(sale_price)
+      { value: sprintf('%d', sale_price.value) }
+    end
+
+    def discount(sale_price)
+      { discount: sprintf('%.2f', sale_price.discount) }
+    end
+  end
+end

data/app/serializers/boat_serializer.rb

@@ -3,14 +3,17 @@ class BoatSerializer < AbstractSerializer
   class << self
     def available_attributes
       %i[
+        boat_beam
         boat_beam_metrics
         boat_beam_metrics_ft
         boat_beam_metrics_meters
         boat_contacts
+        boat_draft
         boat_draft_metrics
         boat_draft_metrics_ft
         boat_draft_metrics_meters
         boat_hull_id
+        boat_length
         boat_length_metrics
         boat_length_metrics_ft
         boat_length_metrics_meters
@@ -20,38 +23,6 @@ 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
         crew_total
         guest_cabins
         guests_total
@@ -64,17 +35,10 @@ class BoatSerializer < AbstractSerializer
         main_boat_photo_id
         motor
         name
-        name_builder
         naval_architect
-        per_season
         picture_medium_url
-        price
-        price_discount
+        prices
         refit_year
-        sale_price_discount
-        sale_price_eur
-        sale_price_rub
-        sale_price_usd
         short_description
         state
         visits_today
@@ -84,10 +48,11 @@ class BoatSerializer < AbstractSerializer
 
     def default_opts
       {
-        uom:         'ft',
-        currency:    'USD',
+        uol:         'ft',
+        currency:    ::Dicts::Currency::USD.index,
         locale:      'en',
-        is_for_rent: true
+        is_for_rent: true,  # TODO:: [bcff00da] УДАЛИТЬ
+        business:    ::Dicts::Business::RENT.index
       }
     end
 
@@ -107,21 +72,6 @@ class BoatSerializer < AbstractSerializer
       { naval_architect: boat.naval_architect }
     end
 
-    # Для страницы просмотра лодки
-    #
-    # example: Carpe Diem by Lazzara
-    # example: Ismail
-    def name_builder(boat)
-      arr = []
-      arr << boat.name&.strip
-      if boat.builder.present?
-        arr << I18n.t('boat.builder.prefix')
-        arr << boat.builder.strip
-      end
-
-      { name_builder: arr * ' ' }
-    end
-
     # noinspection RubyResolve
     def picture_medium_url(boat)
       url = if boat.boat_photo.present?
@@ -160,35 +110,35 @@ class BoatSerializer < AbstractSerializer
     end
 
     # per day, per week; в день, в час, за месяц;
-    def per_season(boat)
-      season_key = ::Lib::Boats::RentPricePerSeason.spot_rentprice_id(boat, @opts[:currency], @opts[:rent_price_id]).gsub(/_low|_high/, '')
+    # def per_season(boat)
+    #   season_key = ::Lib::Boats::RentPricePerSeason.spot_rentprice_id(boat, @opts[:currency], @opts[:rent_price_id]).gsub(/_low|_high/, '')
       #=> charter_1_week_low, charter_1_day_high
-      translate  = I18n.t("boat.rent_price.per_#{season_key}")
-      value      = @opts[:is_for_rent] ? translate : ''
-
-      { per_season: value }
-    end
+      # translate  = I18n.t("boat.rent_price.per_#{season_key}")
+      # value      = @opts[:is_for_rent] ? translate : ''
+      #
+      # { per_season: value }
+    # end
 
     # ₽ 293,885
-    def price(boat)
-      value = if @opts[:is_for_rent]
-                ::Lib::Boats::RentPricePerSeason.price(boat, @opts[:currency], @opts[:rent_price_id])
-              else
-                ::Lib::Boats::SalePrice.price(boat, @opts[:currency])
-              end
-
-      { price: value }
-    end
+    # def price(boat)
+    #   value = if @opts[:is_for_rent]
+    #             ::Lib::Boats::RentPricePerSeason.price(boat, @opts[:currency], @opts[:rent_price_id])
+    #           else
+    #             ::Lib::Boats::SalePrice.price(boat, @opts[:currency])
+    #           end
+    #
+    #   { price: value }
+    # end
 
     # 12%
-    def price_discount(boat)
-      value = if @opts[:is_for_rent]
-                ::Lib::Boats::RentPricePerSeason.price_discount(boat, @opts[:currency])
-              else
-                ::Lib::Boats::SalePrice.price_discount(boat)
-              end
-      { price_discount: value }
-    end
+    # def price_discount(boat)
+    #   value = if @opts[:is_for_rent]
+    #             ::Lib::Boats::RentPricePerSeason.price_discount(boat, @opts[:currency])
+    #           else
+    #             ::Lib::Boats::SalePrice.price_discount(boat)
+    #           end
+    #   { price_discount: value }
+    # end
 
     def guests_total(boat)
       { guests_total: boat.guests_total }
@@ -244,200 +194,237 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
-    def boat_length_metrics(boat)
-      value = ::Lib::Boats::Dimensions.boatlength(boat, @opts[:uom])
-      { boat_length_metrics: value }
+    def boat_length(boat)
+      {
+          boat_length: {
+              value: boat.send('boat_length_metrics_%s' % @opts[:uol]),
+              uol:   @opts[:uol]
+          }
+      }
     end
 
+    # [bcff00da] : вся подобная логика переезжает во фронт, переделано должно быть по образу `def boat_length`
+
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_length_metrics(boat)
+    #   value = ::Lib::Boats::Dimensions.boatlength(boat, @opts[:uol])
+    #   { boat_length_metrics: value }
+    # end
+
+    # TODO:: [bcff00da] УДАЛИТЬ - пока используется при обновлении/создании лодки в админке
     def boat_length_metrics_meters(boat)
       { boat_length_metrics_meters: boat.boat_length_metrics_meters }
     end
 
+    # TODO:: [bcff00da] УДАЛИТЬ - пока используется при обновлении/создании лодки в админке
     def boat_length_metrics_ft(boat)
       { boat_length_metrics_ft: boat.boat_length_metrics_ft }
     end
 
-    def boat_beam_metrics(boat)
-      value = ::Lib::Boats::Dimensions.boatbeam(boat, @opts[:uom])
-      { boat_beam_metrics: value }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_beam_metrics(boat)
+    #   value = ::Lib::Boats::Dimensions.boatbeam(boat, @opts[:uol])
+    #   { boat_beam_metrics: value }
+    # end
 
-    def boat_beam_metrics_ft(boat)
-      { boat_beam_metrics_ft: boat.boat_beam_metrics_ft }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_beam_metrics_ft(boat)
+    #   { boat_beam_metrics_ft: boat.boat_beam_metrics_ft }
+    # end
 
-    def boat_beam_metrics_meters(boat)
-      { boat_beam_metrics_meters: boat.boat_beam_metrics_meters }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_beam_metrics_meters(boat)
+    #   { boat_beam_metrics_meters: boat.boat_beam_metrics_meters }
+    # end
 
-    def boat_draft_metrics(boat)
-      value = ::Lib::Boats::Dimensions.boatdraft(boat, @opts[:uom])
-      { boat_draft_metrics: value }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_draft_metrics(boat)
+    #   value = ::Lib::Boats::Dimensions.boatdraft(boat, @opts[:uol])
+    #   { boat_draft_metrics: value }
+    # end
 
-    def boat_draft_metrics_ft(boat)
-      { boat_draft_metrics_ft: boat.boat_draft_metrics_ft }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_draft_metrics_ft(boat)
+    #   { boat_draft_metrics_ft: boat.boat_draft_metrics_ft }
+    # end
 
-    def boat_draft_metrics_meters(boat)
-      { boat_draft_metrics_meters: boat.boat_draft_metrics_meters }
-    end
+    # TODO:: [bcff00da] УДАЛИТЬ
+    # def boat_draft_metrics_meters(boat)
+    #   { boat_draft_metrics_meters: boat.boat_draft_metrics_meters }
+    # end
 
     def boat_hull_id(boat)
       { boat_hull_id: boat.boat_hull_id }
     end
 
-    # --[low]-----------------------------------------------------------------------------------------------------------
-
-    def charter_1_hour_low_usd(boat)
-      { charter_1_hour_low_usd: boat.charter_1_hour_low_usd }
-    end
-
-    def charter_1_hour_low_rub(boat)
-      { charter_1_hour_low_rub: boat.charter_1_hour_low_rub }
-    end
-
-    def charter_1_hour_low_eur(boat)
-      { charter_1_hour_low_eur: boat.charter_1_hour_low_eur }
-    end
-
-    def charter_1_day_low_usd(boat)
-      { charter_1_day_low_usd: boat.charter_1_day_low_usd }
-    end
+    def prices(boat)
+      currency_id  = ::Dicts::Currency.find_by_index(@opts[:currency]).id
+      prices       = if @opts[:business] == ::Dicts::Business::RENT.index
+                       boat.boat_prices.select { |bp| bp.currency_id == currency_id }.map { |bp| ::BoatPriceSerializer.serialize bp }
+                     else
+                       # noinspection RubyResolve
+                       boat.boat_sale_prices.select { |bp| bp.currency_id == currency_id }.map { |bps| ::BoatSalePriceSerializer.serialize bps }
+                     end
 
-    def charter_1_day_low_rub(boat)
-      { charter_1_day_low_rub: boat.charter_1_day_low_rub }
-    end
-
-    def charter_1_day_low_eur(boat)
-      { charter_1_day_low_eur: boat.charter_1_day_low_eur }
-    end
-
-    def charter_1_week_low_usd(boat)
-      { charter_1_week_low_usd: boat.charter_1_week_low_usd }
-    end
-
-    def charter_1_week_low_rub(boat)
-      { charter_1_week_low_rub: boat.charter_1_week_low_rub }
-    end
-
-    def charter_1_week_low_eur(boat)
-      { charter_1_week_low_eur: boat.charter_1_week_low_eur }
-    end
-
-    def charter_1_month_low_usd(boat)
-      { charter_1_month_low_usd: boat.charter_1_month_low_usd }
+      {
+          prices:   {
+              list:     prices,
+              business: @opts[:business]
+          }
+      }
     end
 
-    def charter_1_month_low_rub(boat)
-      { charter_1_month_low_rub: boat.charter_1_month_low_rub }
-    end
+    # --[low]-----------------------------------------------------------------------------------------------------------
 
-    def charter_1_month_low_eur(boat)
-      { charter_1_month_low_eur: boat.charter_1_month_low_eur }
-    end
+    # def charter_1_hour_low_usd(boat)
+    #   { charter_1_hour_low_usd: boat.charter_1_hour_low_usd }
+    # end
+    #
+    # def charter_1_hour_low_rub(boat)
+    #   { charter_1_hour_low_rub: boat.charter_1_hour_low_rub }
+    # end
+    #
+    # def charter_1_hour_low_eur(boat)
+    #   { charter_1_hour_low_eur: boat.charter_1_hour_low_eur }
+    # end
+    #
+    # def charter_1_day_low_usd(boat)
+    #   { charter_1_day_low_usd: boat.charter_1_day_low_usd }
+    # end
+    #
+    # def charter_1_day_low_rub(boat)
+    #   { charter_1_day_low_rub: boat.charter_1_day_low_rub }
+    # end
+    #
+    # def charter_1_day_low_eur(boat)
+    #   { charter_1_day_low_eur: boat.charter_1_day_low_eur }
+    # end
+    #
+    # def charter_1_week_low_usd(boat)
+    #   { charter_1_week_low_usd: boat.charter_1_week_low_usd }
+    # end
+    #
+    # def charter_1_week_low_rub(boat)
+    #   { charter_1_week_low_rub: boat.charter_1_week_low_rub }
+    # end
+    #
+    # def charter_1_week_low_eur(boat)
+    #   { charter_1_week_low_eur: boat.charter_1_week_low_eur }
+    # end
+    #
+    # def charter_1_month_low_usd(boat)
+    #   { charter_1_month_low_usd: boat.charter_1_month_low_usd }
+    # end
+    #
+    # def charter_1_month_low_rub(boat)
+    #   { charter_1_month_low_rub: boat.charter_1_month_low_rub }
+    # end
+    #
+    # def charter_1_month_low_eur(boat)
+    #   { charter_1_month_low_eur: boat.charter_1_month_low_eur }
+    # end
 
     # --[high]-----------------------------------------------------------------------------------------------------------
 
-    def charter_1_hour_high_usd(boat)
-      { charter_1_hour_high_usd: boat.charter_1_hour_high_usd }
-    end
-
-    def charter_1_hour_high_rub(boat)
-      { charter_1_hour_high_rub: boat.charter_1_hour_high_rub }
-    end
-
-    def charter_1_hour_high_eur(boat)
-      { charter_1_hour_high_eur: boat.charter_1_hour_high_eur }
-    end
-
-    def charter_1_day_high_usd(boat)
-      { charter_1_day_high_usd: boat.charter_1_day_high_usd }
-    end
-
-    def charter_1_day_high_rub(boat)
-      { charter_1_day_high_rub: boat.charter_1_day_high_rub }
-    end
-
-    def charter_1_day_high_eur(boat)
-      { charter_1_day_high_eur: boat.charter_1_day_high_eur }
-    end
-
-    def charter_1_week_high_usd(boat)
-      { charter_1_week_high_usd: boat.charter_1_week_high_usd }
-    end
-
-    def charter_1_week_high_rub(boat)
-      { charter_1_week_high_rub: boat.charter_1_week_high_rub }
-    end
-
-    def charter_1_week_high_eur(boat)
-      { charter_1_week_high_eur: boat.charter_1_week_high_eur }
-    end
-
-    def charter_1_month_high_usd(boat)
-      { charter_1_month_high_usd: boat.charter_1_month_high_usd }
-    end
-
-    def charter_1_month_high_rub(boat)
-      { charter_1_month_high_rub: boat.charter_1_month_high_rub }
-    end
-
-    def charter_1_month_high_eur(boat)
-      { charter_1_month_high_eur: boat.charter_1_month_high_eur }
-    end
+    # def charter_1_hour_high_usd(boat)
+    #   { charter_1_hour_high_usd: boat.charter_1_hour_high_usd }
+    # end
+    #
+    # def charter_1_hour_high_rub(boat)
+    #   { charter_1_hour_high_rub: boat.charter_1_hour_high_rub }
+    # end
+    #
+    # def charter_1_hour_high_eur(boat)
+    #   { charter_1_hour_high_eur: boat.charter_1_hour_high_eur }
+    # end
+    #
+    # def charter_1_day_high_usd(boat)
+    #   { charter_1_day_high_usd: boat.charter_1_day_high_usd }
+    # end
+    #
+    # def charter_1_day_high_rub(boat)
+    #   { charter_1_day_high_rub: boat.charter_1_day_high_rub }
+    # end
+    #
+    # def charter_1_day_high_eur(boat)
+    #   { charter_1_day_high_eur: boat.charter_1_day_high_eur }
+    # end
+    #
+    # def charter_1_week_high_usd(boat)
+    #   { charter_1_week_high_usd: boat.charter_1_week_high_usd }
+    # end
+    #
+    # def charter_1_week_high_rub(boat)
+    #   { charter_1_week_high_rub: boat.charter_1_week_high_rub }
+    # end
+    #
+    # def charter_1_week_high_eur(boat)
+    #   { charter_1_week_high_eur: boat.charter_1_week_high_eur }
+    # end
+    #
+    # def charter_1_month_high_usd(boat)
+    #   { charter_1_month_high_usd: boat.charter_1_month_high_usd }
+    # end
+    #
+    # def charter_1_month_high_rub(boat)
+    #   { charter_1_month_high_rub: boat.charter_1_month_high_rub }
+    # end
+    #
+    # def charter_1_month_high_eur(boat)
+    #   { charter_1_month_high_eur: boat.charter_1_month_high_eur }
+    # end
 
     # --[sale]----------------------------------------------------------------------------------------------------------
 
-    def sale_price_usd(boat)
-      { sale_price_usd: boat.sale_price_usd }
-    end
-
-    def sale_price_rub(boat)
-      { sale_price_rub: boat.sale_price_rub }
-    end
-
-    def sale_price_eur(boat)
-      { sale_price_eur: boat.sale_price_eur }
-    end
+    # def sale_price_usd(boat)
+    #   { sale_price_usd: boat.sale_price_usd }
+    # end
+    #
+    # def sale_price_rub(boat)
+    #   { sale_price_rub: boat.sale_price_rub }
+    # end
+    #
+    # def sale_price_eur(boat)
+    #   { 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 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 sale_price_discount(boat)
+    #   { sale_price_discount: boat.sale_price_discount }
+    # end
 
     def state(boat)
       { state: boat.state }

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

@@ -4,7 +4,7 @@ module Configs
       # список ценовых (продажа/аренда) атрибутов Лодки
       def self.attributes(price_attributes = ::Dictionaries::BoatCharterAttribute::ALL)
         attributes = []
-        ::Dicts::Currency.all.each do |currency|
+        ::Dicts::Currency::ALL.each do |currency|
           price_attributes.map do |attr|
             field = Currency.attribute_name currency.index, attr
             next unless field

data/app/serializers/configs/boats/central_agent/boat_list.rb

@@ -12,13 +12,12 @@ module Configs
             guests_total
             guest_cabins
             crew_total
-            boat_length_metrics
+            boat_length
             built_year
             boat_model
             boat_type
             location_address
-            price
-            per_season
+            prices
             state
             visits_total
             visits_today

data/app/serializers/configs/lease/central_agent/inquiry_list.rb

@@ -12,7 +12,7 @@ module Configs
             :my_price,
             :my_price_currency,
             :address,
-            :period,
+            :period_formatted,
             :duration,
             :guests,
             :kids,

data/app/serializers/lease/inquiry_serializer.rb

@@ -19,6 +19,7 @@ module Lease
           :latitude,
           :longitude,
           :period,
+          :period_formatted,
           :duration,
           :from,
           :to,
@@ -112,6 +113,17 @@ module Lease
         { period: '%s - %s' % [from(inquiry)[:from], to(inquiry)[:to]] }
       end
 
+      def period_formatted(inquiry)
+        frm = format_date(inquiry.from, @opts[:locale], false, true)
+        tto = format_date(inquiry.to, @opts[:locale], false, true)
+
+        { period: {
+            from: frm,
+            to:   tto
+          }
+        }
+      end
+
       def duration(inquiry)
         distance = (inquiry.to - inquiry.from).to_i / 24 / 60 / 60
         distance = distance.zero? ? 1 : distance

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

@@ -0,0 +1,5 @@
+en:
+  dicts:
+    length:
+      ft:     ft
+      meters: m

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

@@ -0,0 +1,5 @@
+ru:
+  dicts:
+    length:
+      ft:     фут
+      meters: м

data/lib/c80_shared/dict.rb

@@ -9,13 +9,17 @@ class Dict
   end
 
   def self.all
-    constants.map { |const| const_get const }
+    constants.select { |const| (const_get const).class != Array }.map { |const| const_get const }                       # пока я не добавил константы типа ALL, работала эта строка: constants.map { |const| const_get const }
   end
 
   def self.find(id)
     all.select { |const| const.id == id.to_i }.first
   end
 
+  def self.find_by_index(index)
+    all.select { |const| const.index == index }.first
+  end
+
   def self.where(ids)
     all.select { |const| ids.include?(const.id) }
   end

data/lib/c80_shared/engine.rb

@@ -1,5 +1,5 @@
 module C80Shared
   class Engine < ::Rails::Engine
-    config.i18n.load_path += Dir[config.root.join('config', 'locales', '*','*.{yml}').to_s]
+    config.i18n.load_path += Dir[config.root.join('config', 'locales', '**','*.{yml}').to_s]
   end
 end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.28"
+  VERSION = "0.1.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,8 +49,13 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - README.md
+- app/dicts/boat_type.rb
+- app/dicts/business.rb
+- app/dicts/charter_season.rb
+- app/dicts/charter_uom.rb
 - app/dicts/currency.rb
 - app/dicts/email_token_subj.rb
+- app/dicts/length.rb
 - app/dicts/locale.rb
 - app/dicts/rent_skip_type.rb
 - app/helpers/custom/currency_helper.rb
@@ -58,6 +63,8 @@ files:
 - app/helpers/custom/price_helper.rb
 - app/helpers/custom/select_helper.rb
 - app/helpers/site/time_helper.rb
+- app/serializers/boat_price_serializer.rb
+- app/serializers/boat_sale_price_serializer.rb
 - app/serializers/boat_serializer.rb
 - app/serializers/boat_visit_day_serializer.rb
 - app/serializers/configs/boats/boat_prices.rb
@@ -78,6 +85,8 @@ files:
 - c80_shared.gemspec
 - config/locales/boat/en.yml
 - config/locales/boat/ru.yml
+- config/locales/dicts/length/en.yml
+- config/locales/dicts/length/ru.yml
 - config/locales/rent_skip_type/en.yml
 - config/locales/rent_skip_type/ru.yml
 - lib/c80_shared.rb