c80_catoffers 0.1.0.3 → 0.1.0.4

data/app/views/c80_catoffers/_offers_list_widget.html.erb

@@ -2,55 +2,61 @@
     # в списке представить в виде блока с указанным списком свойств +list_props+
 %>
 
-<div class="offer_list_widget clearfix list_count_<%= list_offers.count %> <%= css_style_for_block %>">
-
-  <ul class="clearfix">
-
-    <%# перебираем предложения, формируем список %>
-    <% list_offers.each_with_index do |offer, offer_index| %>
-        <li class="clearfix">
-
-        <%# перебираем все имена свойств и для каждого предложения строим список %>
-        <% list_props.each_with_index do |prop_name, prop_index| %>
-
-            <%# ради возможных стилизаций будем вести счетчик и впишем его в класс каждого блока свойства %>
-            <% prop_name_counter_class = "pr_#{prop_index}" %>
-
-            <%# NOTE:: переберём имена свойств и под каждое применим свои правила форматирования %>
-
-            <%# обложку предложения помещаем в ссылку и делаем lazy %>
-            <% if prop_name['thumb'].present? %>
-                <%= render_image_link_lazy({
-                                                   :alt_image => offer.title,
-                                                   :image => offer.ophoto_thumb(prop_name), # prop_name = thumb_sm, например
-                                                   :a_href => my_url_for_offer(offer),
-                                                   :a_class => prop_name_counter_class,
-                                                   :a_css_style => css_for_a,
-                                                   :a_rel => 'nofollow'
-                                           }) %>
-
-            <%# название обложки делаем кликабельным %>
-            <% elsif prop_name['title'].present? %>
-                  <%= link_to offer.title,
-                              my_url_for_offer(offer),
-                              title: offer.title,
-                              style: css_for_title,
-                              class: "title #{prop_name_counter_class}"
-                  %>
-
-            <%# остальные свойства выводим стопкой именованных дивов %>
-            <% else %>
-                      <div class="<%= "#{prop_name} #{prop_name_counter_class}" %>" style="<%= css_for_title %>">
-                        <%= list_of_values_lists[offer_index][prop_index] %> <%# NOTE:: извлекаем значение prop_index-свойства для offer_index-предложения %>
-                      </div>
-            <% end %>
-
-            <%# NOTE:: закончили перебирать имена свойств %>
+<div class="offer_list_widget_wrapper">
+  <% if h3_title.present? %>
+      <h3 class="section_title h3_for_offer_list_widget"><%= h3_title %></h3>
+  <% end %>
+
+  <div class="offer_list_widget clearfix list_count_<%= list_offers.count %> <%= css_style_for_block %>">
+
+    <ul class="clearfix">
+
+      <%# перебираем предложения, формируем список %>
+      <% list_offers.each_with_index do |offer, offer_index| %>
+          <li class="clearfix">
+
+            <%# перебираем все имена свойств и для каждого предложения строим список %>
+            <% list_props.each_with_index do |prop_name, prop_index| %>
+
+                <%# ради возможных стилизаций будем вести счетчик и впишем его в класс каждого блока свойства %>
+                <% prop_name_counter_class = "pr_#{prop_index}" %>
+
+                <%# NOTE:: переберём имена свойств и под каждое применим свои правила форматирования %>
+
+                <%# обложку предложения помещаем в ссылку и делаем lazy %>
+                <% if prop_name['thumb'].present? %>
+                    <%= render_image_link_lazy({
+                                                       :alt_image => offer.title,
+                                                       :image => offer.ophoto_thumb(prop_name), # prop_name = thumb_sm, например
+                                                       :a_href => my_url_for_offer(offer),
+                                                       :a_class => prop_name_counter_class,
+                                                       :a_css_style => css_for_a,
+                                                       :a_rel => 'nofollow'
+                                               }) %>
+
+                    <%# название обложки делаем кликабельным %>
+                <% elsif prop_name['title'].present? %>
+                    <%= link_to offer.title,
+                                my_url_for_offer(offer),
+                                title: offer.title,
+                                style: css_for_title,
+                                class: "title #{prop_name_counter_class}"
+                    %>
+
+                    <%# остальные свойства выводим стопкой именованных дивов %>
+                <% else %>
+                    <div class="<%= "#{prop_name} #{prop_name_counter_class}" %>" style="<%= css_for_title %>">
+                      <%= list_of_values_lists[offer_index][prop_index] %> <%# NOTE:: извлекаем значение prop_index-свойства для offer_index-предложения %>
+                    </div>
+                <% end %>
+
+                <%# NOTE:: закончили перебирать имена свойств %>
 
-        <% end %>
+            <% end %>
 
-        </li>
-    <% end %>
-  </ul>
+          </li>
+      <% end %>
+    </ul>
 
+  </div>
 </div>

data/app/views/c80_catoffers/_offers_page.html.erb

@@ -0,0 +1,23 @@
+<% # Нарисовать страницу просмотра всех Предложений.
+   #
+%>
+
+<div class="ajax_div_offers offers_page <%= css_style_for_block %>" data-css_class_offers_block="<%= css_style_for_block %>">
+
+  <%= render :partial => 'c80_catoffers/offers_list_widget',
+             :locals => {
+                     list_props:            list_props,
+                     css_style_for_block:   css_style_for_block,
+                     list_offers:           list_offers,
+                     list_of_values_lists:  list_of_values_lists,
+                     css_for_a:             css_for_a,
+                     css_for_title:         css_for_title,
+                     h3_title:              nil
+             }
+  %>
+
+  <div class="div_will_paginate">
+    <%= will_paginate list_offers %>
+  </div>
+
+</div>

data/app/views/c80_catoffers/_popup_price.html.erb

@@ -0,0 +1,2 @@
+<% bs_modal = _render_bs_modal(content,title) %>
+<%= bs_modal.html_safe %>

data/app/views/c80_catoffers/application/offers_guru.js.erb

@@ -0,0 +1,10 @@
+<%# TODO:: убрать временный хардкод %w(thumb_md title price) %>
+var html_str = "<%= j render_offers_page(%w(thumb_md title price), 'sokol', 'thumb_md', params[:page]) %>";
+
+var $aa = fOffersGetBlock();
+$aa.replaceWith(html_str);
+
+Holder.run($aa.find("img"));
+fLazyStart();
+
+fOffersProccessPaginateLinks();

data/app/views/c80_catoffers/application/price_me.js.erb

@@ -0,0 +1,19 @@
+
+var $body = $('body');
+
+// вставим окно
+var html_str = "<%= j render_popup_price %>";
+var $m = $(html_str);
+$body.append($m);
+
+// покажем окно
+$('#c80_catoffers_bs_modal').modal('show');
+
+// настроим форму
+//var $form = $("form#form_feedback");
+//
+//$form.bind("ajax:error", function (event, data, status, xhr) {
+//    $form.render_form_errors($.parseJSON(data.responseText));
+//});
+//
+//$form.modal_success();

data/config/locales/ru.yml

@@ -0,0 +1,6 @@
+ru:
+  c80_catoffers:
+    offer_list_widget:
+      h3_title: 'Услуги'
+    csamples_widget:
+      h3_title: 'Пример рассчёта стоимости'

data/config/routes.rb

@@ -1,13 +1,7 @@
 C80Catoffers::Engine.routes.draw do
 
-  # get 'offers/(:offer_slug)', :to => 'site#view_gallery'
-
-  # match 'news_guru', :to => 'application#guru', :via => :post
-  # match 'rb', :to => 'banners#counter', :via => :post
-
-  # get '/auth/:provider/callback', to: 'sessions#create'
-  # delete '/logout', to: 'sessions#destroy'
-
-  # resources :comments, :only => :create
+  # root to: 'application#fake_main' # NOTE:: добавлен только чтобы работал UrlsHelper
+  match 'offers_guru', :to => 'application#offers_guru', :via => :post
+  match 'price_me', :to => 'application#price_me', :via => :post
 
 end

data/db/migrate/20161105123939_c80_catoffers_add_per_page_to_props.rb

@@ -0,0 +1,5 @@
+class C80CatoffersAddPerPageToProps < ActiveRecord::Migration
+  def change
+    add_column :c80_catoffers_props, :per_page, :integer
+  end
+end

data/db/migrate/20161106154221_create_c80_catoffers_csamples.rb

@@ -0,0 +1,13 @@
+class CreateC80CatoffersCsamples < ActiveRecord::Migration
+  def change
+    create_table :c80_catoffers_csamples, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :sub_title
+      t.string :csphoto
+      t.integer :ord
+      t.integer :summ_price
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161106191544_create_c80_catoffers_crows.rb

@@ -0,0 +1,13 @@
+class CreateC80CatoffersCrows < ActiveRecord::Migration
+  def change
+    create_table :c80_catoffers_crows, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.integer :ord
+      t.references :csample, index: true
+      t.references :offer, index: true
+
+      t.timestamps null: false
+    end
+    # add_foreign_key :c80_catoffers_crows, :csamples
+    # add_foreign_key :c80_catoffers_crows, :offers
+  end
+end

data/db/migrate/20161107115555_c80_catoffers_create_csprops.rb

@@ -0,0 +1,7 @@
+class C80CatoffersCreateCsprops < ActiveRecord::Migration
+  def change
+    create_table :c80_catoffers_csprops, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161107123333_c80_catoffers_create_join_table_csprops_csamples.rb

@@ -0,0 +1,11 @@
+class C80CatoffersCreateJoinTableCspropsCsamples < ActiveRecord::Migration
+  def change
+    create_table :c80_catoffers_csamples_csprops, :id => false do |t|
+      t.integer :csprop_id, :null => false
+      t.integer :csample_id, :null => false
+    end
+
+    add_index :c80_catoffers_csamples_csprops, [:csprop_id, :csample_id], :unique => true, :name => 'my_index_23'
+
+  end
+end

data/db/seeds/c80_catoffers_01_fill_props.rb

@@ -13,5 +13,6 @@ C80Catoffers::Prop.create!({
                                thumb_md_height: 160,     # NOTE:: просто стандартный размер
                                thumb_lg_width:  1000,     # NOTE:: просто стандартный размер
                                thumb_lg_height: 550,    # NOTE:: просто стандартный размер
-                               positions_count: 4
+                               positions_count: 4,
+                               per_page:        6       # сколько Предложений вывести в хелпере render_offers_page
                            })

data/lib/c80_catoffers/version.rb

@@ -1,3 +1,3 @@
 module C80Catoffers
-  VERSION = "0.1.0.3"
+  VERSION = "0.1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_catoffers
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,10 +66,13 @@ files:
 - README.md
 - Rakefile
 - app/admin/c80_catoffers/categories.rb
+- app/admin/c80_catoffers/csamples.rb
+- app/admin/c80_catoffers/csprops.rb
 - app/admin/c80_catoffers/offers.rb
 - app/admin/c80_catoffers/props.rb
 - app/assets/javascripts/c80_catoffers.js.coffee
 - app/assets/javascripts/c80_catoffers/offer_full_desc.js
+- app/assets/javascripts/c80_catoffers/offers_ajax.js
 - app/assets/stylesheets/c80_catoffers.scss
 - app/assets/stylesheets/c80_catoffers/_mixins/default_li_iconed.scss
 - app/assets/stylesheets/c80_catoffers/offer_full_desc.scss
@@ -78,25 +81,42 @@ files:
 - app/assets/stylesheets/c80_catoffers/offer_list_iconed.scss
 - app/assets/stylesheets/c80_catoffers/offer_list_iconed_columns.scss
 - app/assets/stylesheets/c80_catoffers/offer_list_widget.scss
+- app/assets/stylesheets/c80_catoffers/will_paginate.scss
 - app/assets/stylesheets/c80_catoffers_backend.scss
 - app/assets/stylesheets/c80_catoffers_backend/page_admin_props.scss
+- app/controllers/c80_catoffers/application_controller.rb
 - app/helpers/c80_catoffers/app_helper.rb
+- app/helpers/c80_catoffers/csamples_helper.rb
 - app/helpers/c80_catoffers/inner/css_helper.rb
+- app/helpers/c80_catoffers/inner/modal_helper.rb
+- app/helpers/c80_catoffers/price_helper.rb
 - app/helpers/c80_catoffers/urls_helper.rb
 - app/models/c80_catoffers/category.rb
+- app/models/c80_catoffers/crow.rb
+- app/models/c80_catoffers/csample.rb
+- app/models/c80_catoffers/csprop.rb
 - app/models/c80_catoffers/offer.rb
 - app/models/c80_catoffers/ophoto.rb
 - app/models/c80_catoffers/prop.rb
+- app/uploaders/c80_catoffers/csphoto_uploader.rb
 - app/uploaders/c80_catoffers/ophoto_uploader.rb
+- app/views/c80_catoffers/_bs_modal.html.erb
+- app/views/c80_catoffers/_csamples_widget.html.erb
 - app/views/c80_catoffers/_offer_full_desc.html.erb
 - app/views/c80_catoffers/_offers_list_by_cat.html.erb
 - app/views/c80_catoffers/_offers_list_grouped.html.erb
 - app/views/c80_catoffers/_offers_list_iconed.html.erb
 - app/views/c80_catoffers/_offers_list_iconed_columns.html.erb
 - app/views/c80_catoffers/_offers_list_widget.html.erb
+- app/views/c80_catoffers/_offers_page.html.erb
+- app/views/c80_catoffers/_popup_price.html.erb
+- app/views/c80_catoffers/application/fake_main.html.erb
+- app/views/c80_catoffers/application/offers_guru.js.erb
+- app/views/c80_catoffers/application/price_me.js.erb
 - bin/console
 - bin/setup
 - c80_catoffers.gemspec
+- config/locales/ru.yml
 - config/routes.rb
 - db/migrate/201609221321_c80_catoffers_create_props.rb
 - db/migrate/201609221322_c80_catoffers_create_categories.rb
@@ -107,6 +127,11 @@ files:
 - db/migrate/20161008134848_c80_catoffers_add_join_table_offers_props.rb
 - db/migrate/20161008151414_c80_catoffers_add_positions_count_to_props.rb
 - db/migrate/20161023115252_c80_catoffers_add_thumb_md_to_props.rb
+- db/migrate/20161105123939_c80_catoffers_add_per_page_to_props.rb
+- db/migrate/20161106154221_create_c80_catoffers_csamples.rb
+- db/migrate/20161106191544_create_c80_catoffers_crows.rb
+- db/migrate/20161107115555_c80_catoffers_create_csprops.rb
+- db/migrate/20161107123333_c80_catoffers_create_join_table_csprops_csamples.rb
 - db/seeds/c80_catoffers_01_fill_props.rb
 - db/seeds/c80_catoffers_02_fill_offers.rb
 - db/seeds/x02_fill_categories.rb