c80_catoffers 0.1.0.5 → 0.1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24a140e8e1791afd467b47c91cecce3fde43a05
-  data.tar.gz: c1b606cceea2bc85671d82460c29f2ef4a45efe2
+  metadata.gz: 799acd02cc226c0ceea7ffb1d1ed099a55692f96
+  data.tar.gz: 9eef70870ee7a13a9822591d2baba9765f609b1e
 SHA512:
-  metadata.gz: b2ecc4996ba2766dd631aeb4e1f33efc41267a2dea446c0ed09b05634af480e6ef13a29333a2c7cc2a8626661cc2fa506b340924d82bcc585e9624e676cc9efa
-  data.tar.gz: efaa06b0777b51d3de73b07ff84eeda4e1e10b9401db560b28eb097c4fd1e951d05871996ff574fbf137752cc5389fcc67db69be223120dd4fc7acd9351aba94
+  metadata.gz: 8c2e7d24b5e14401b902899c70b89c7973f260288ed111231daff8036db00899ba7e1c957c6bd7047aee0ad8fc19ca901d3aed1fdcd80e5a3480da31604ee338
+  data.tar.gz: 6d78af6d91eb805b080e351b5f3c8b6ccfba55ff611333296801a294e915e4c5b9c5e590c4350f809c2ac67bb35c9defbf8082203d0821686ab4b4ea7f45703b

data/app/admin/c80_catoffers/prices.rb

@@ -0,0 +1,34 @@
+ActiveAdmin.register C80Catoffers::Price, as: 'Price' do
+
+  menu :label => 'Прайсы', # TODO_MY:: название пункта меню перенесести в параметры в базу
+       priority: 3,
+       parent: 'Услуги' # TODO_MY:: название пункта меню перенесести в параметры в базу
+
+  permit_params :title,
+                :file
+
+  batch_action :destroy, false
+
+  before_filter :skip_sidebar!, :only => :index
+
+  index do
+    column :title
+    column :file do |price|
+      link_to price.file, price.file.url, { :target => '_blank' }
+    end
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+    f.inputs 'Свойства' do
+
+      f.input :title
+      f.input :file,
+              :as => :file,
+              :hint => f.object.file.url #f.template.asset_url(f.object.file.url)
+
+    end
+    f.actions
+  end
+
+end

data/app/controllers/c80_catoffers/application_controller.rb

@@ -5,6 +5,8 @@ module C80Catoffers
 
     helper C80LazyImages::Engine.helpers
 
+    protect_from_forgery with: :exception
+
     def offers_guru
       respond_to do |format|
         format.js

data/app/helpers/c80_catoffers/inner/modal_helper.rb

@@ -3,6 +3,15 @@ module C80Catoffers
     module ModalHelper
 
       def _render_bs_modal(content='', title='')
+
+        # Если имеется загруженный прайс (в виде файла) - допишем к title ссылку на скачивание
+        if Price.all.count > 0
+          p = Price.first
+          file_url = p.file.url
+          file_ext = File.extname(file_url).split('.').join('')
+          title = "#{title} (<a href='#{file_url}' title='Откроется в новом окне' target='_blank'>скачать #{file_ext}</a>)"
+        end
+
         render :partial => 'c80_catoffers/bs_modal',
                :locals => {
                    title: title,

data/app/models/c80_catoffers/price.rb

@@ -0,0 +1,7 @@
+module C80Catoffers
+
+  class Price < ActiveRecord::Base
+    mount_uploader :file, PriceUploader
+  end
+
+end

data/app/uploaders/c80_catoffers/price_uploader.rb

@@ -0,0 +1,26 @@
+module C80Catoffers
+
+  class PriceUploader < CarrierWave::Uploader::Base
+
+    storage :file
+
+    def filename
+      if original_filename
+        "price_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+
+    def store_dir
+      'uploads/prices'
+    end
+
+  end
+
+end

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

@@ -4,13 +4,13 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel"><%= title %></h4>
+        <h4 class="modal-title" id="myModalLabel"><%= title.html_safe %></h4>
       </div>
       <div class="modal-body">
         <%= content.html_safe %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= close_label %></button>
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= close_label.html_safe %></button>
         <!--<button type="button" class="btn btn-primary">Save changes</button>-->
       </div>
     </div>

data/db/migrate/20161213211414_create_c80_catoffers_prices.rb

@@ -0,0 +1,10 @@
+class CreateC80CatoffersPrices < ActiveRecord::Migration
+  def change
+    create_table :c80_catoffers_prices, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :file
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/c80_catoffers/version.rb

@@ -1,3 +1,3 @@
 module C80Catoffers
-  VERSION = '0.1.0.5'
+  VERSION = '0.1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_catoffers
 version: !ruby/object:Gem::Version
-  version: 0.1.0.5
+  version: 0.1.0.6
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - app/admin/c80_catoffers/csamples.rb
 - app/admin/c80_catoffers/csprops.rb
 - app/admin/c80_catoffers/offers.rb
+- app/admin/c80_catoffers/prices.rb
 - app/admin/c80_catoffers/props.rb
 - app/assets/javascripts/c80_catoffers.js.coffee
 - app/assets/javascripts/c80_catoffers/offer_full_desc.js
@@ -97,9 +98,11 @@ files:
 - app/models/c80_catoffers/csprop.rb
 - app/models/c80_catoffers/offer.rb
 - app/models/c80_catoffers/ophoto.rb
+- app/models/c80_catoffers/price.rb
 - app/models/c80_catoffers/prop.rb
 - app/uploaders/c80_catoffers/csphoto_uploader.rb
 - app/uploaders/c80_catoffers/ophoto_uploader.rb
+- app/uploaders/c80_catoffers/price_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
@@ -132,6 +135,7 @@ files:
 - 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/migrate/20161213211414_create_c80_catoffers_prices.rb
 - db/seeds/c80_catoffers_01_fill_props.rb
 - db/seeds/c80_catoffers_02_fill_offers.rb
 - db/seeds/x02_fill_categories.rb