c80_yax 0.1.0.18 → 0.1.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -1
  3. data/app/assets/images/c80_yax/stripe.png +0 -0
  4. data/app/assets/javascripts/c80_yax/frontend/item_color_selector/item_color_selector.js +11 -4
  5. data/app/assets/javascripts/c80_yax/frontend/item_quantity_picker/app.js +11 -3
  6. data/app/assets/javascripts/c80_yax/frontend/item_quantity_picker/item_quantity_picker.js +27 -2
  7. data/app/decorators/c80_yax/item_decorator.rb +4 -1
  8. data/app/views/c80_yax/items/_color_selector.html.erb +2 -2
  9. data/app/views/c80_yax/items/_index.html.erb +4 -1
  10. data/config/routes.rb +1 -0
  11. data/engines/co/README.md +21 -17
  12. data/engines/co/app/admin/co/order_messages.rb +23 -0
  13. data/engines/co/app/assets/javascripts/co/_service/cookies_service.js +71 -2
  14. data/engines/co/app/assets/javascripts/co/add_to_cart/actions/add_row_to_cart.js +2 -2
  15. data/engines/co/app/assets/javascripts/co/add_to_cart/{xapp.js → app.js} +0 -0
  16. data/engines/co/app/assets/javascripts/co/add_to_cart/button_add_to_cart.js +1 -0
  17. data/engines/co/app/assets/javascripts/co/add_to_cart/service/collect_data_for_row.js +5 -1
  18. data/engines/co/app/assets/javascripts/co/add_to_cart_sm/actions/add_row_to_cart_sm.js +17 -0
  19. data/engines/co/app/assets/javascripts/co/add_to_cart_sm/app.js +17 -0
  20. data/engines/co/app/assets/javascripts/co/add_to_cart_sm/button_add_to_cart_sm.js +36 -0
  21. data/engines/co/app/assets/javascripts/co/add_to_cart_sm/service/collect_data_for_row_sm.js +37 -0
  22. data/engines/co/app/assets/javascripts/co/cart_page/app.js +2 -1
  23. data/engines/co/app/assets/javascripts/co/cart_page/cart_page.js +37 -1
  24. data/engines/co/app/assets/javascripts/co/cart_page/cart_table.js +35 -11
  25. data/engines/co/app/assets/javascripts/co/cart_page/message-order-form-ajax.js +53 -0
  26. data/engines/co/app/assets/javascripts/co/cart_page/support/row_maker.js +2 -2
  27. data/engines/co/app/assets/javascripts/co/cart_page/support/row_printer.js +43 -0
  28. data/engines/co/app/assets/javascripts/co/goto_cart/app.js +19 -0
  29. data/engines/co/app/assets/javascripts/co/goto_cart/button_goto_cart.js +40 -0
  30. data/engines/co/app/assets/stylesheets/co/cart_page/form.scss +142 -0
  31. data/engines/co/app/controllers/co/cart_controller.rb +27 -0
  32. data/engines/co/app/helpers/co/cart_page_helper.rb +24 -2
  33. data/engines/co/app/mailers/co/order_message_mailer.rb +29 -0
  34. data/engines/co/app/models/co/order_message.rb +5 -0
  35. data/engines/co/app/models/co/order_message_validator.rb +22 -0
  36. data/engines/co/app/views/co/_cart_page.html.erb +4 -6
  37. data/engines/co/app/views/co/cart/give_me_cart_order_form.js.erb +18 -0
  38. data/engines/co/app/views/co/cart/message_cart_order.js.erb +4 -0
  39. data/engines/co/app/views/co/cart/shared/_cart_order_form.html.erb +83 -0
  40. data/engines/co/app/views/co/cart/shared/_ok_message.html.erb +16 -0
  41. data/engines/co/app/views/co/order_message_mailer/mail_mess.html.erb +1 -0
  42. data/engines/co/config/routes.rb +4 -0
  43. data/engines/co/db/migrate/20170723095252_create_co_order_messages.rb +13 -0
  44. data/engines/co/lib/co/engine.rb +1 -1
  45. data/engines/of/lib/of/engine.rb +1 -1
  46. data/lib/c80_yax/version.rb +1 -1
  47. metadata +25 -4
  48. data/engines/co/app/assets/javascripts/co/add_to_cart/data_order_row.js +0 -16
@@ -0,0 +1,4 @@
1
+ Co::Engine.routes.draw do
2
+ match '/message_cart_order', :to => 'cart#message_cart_order', :via => :post
3
+ match '/give_me_cart_order_form', :to => 'cart#give_me_cart_order_form', :via => :get
4
+ end
@@ -0,0 +1,13 @@
1
+ class CreateCoOrderMessages < ActiveRecord::Migration
2
+ def change
3
+ create_table :co_order_messages do |t|
4
+ t.string :name
5
+ t.string :date
6
+ t.string :city
7
+ t.string :phone
8
+ t.text :comment
9
+
10
+ t.timestamps
11
+ end
12
+ end
13
+ end
@@ -6,7 +6,7 @@ module Co
6
6
  if defined?(ActiveAdmin)
7
7
  ActiveAdmin.application.load_paths += Dir["#{config.root}/app/models/**/"]
8
8
  #ActiveAdmin.application.load_paths += Dir["#{config.root}/app/models/concerns/**/"]
9
- ActiveAdmin.application.load_paths += Dir["#{config.root}/app/admin/ti/**/"]
9
+ ActiveAdmin.application.load_paths += Dir["#{config.root}/app/admin/**/"]
10
10
  # ActiveAdmin.application.load_paths += Dir["#{config.root}/app/jobs/**/"]
11
11
  end
12
12
  end
@@ -6,7 +6,7 @@ module Of
6
6
  if defined?(ActiveAdmin)
7
7
  ActiveAdmin.application.load_paths += Dir["#{config.root}/app/models/**/"]
8
8
  #ActiveAdmin.application.load_paths += Dir["#{config.root}/app/models/concerns/**/"]
9
- ActiveAdmin.application.load_paths += Dir["#{config.root}/app/admin/ti/**/"]
9
+ ActiveAdmin.application.load_paths += Dir["#{config.root}/app/admin/**/"]
10
10
  # ActiveAdmin.application.load_paths += Dir["#{config.root}/app/jobs/**/"]
11
11
  end
12
12
  end
@@ -1,3 +1,3 @@
1
1
  module C80Yax
2
- VERSION = '0.1.0.18'
2
+ VERSION = '0.1.0.20'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: c80_yax
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.18
4
+ version: 0.1.0.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - C80609A
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-07-22 00:00:00.000000000 Z
11
+ date: 2017-07-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -134,6 +134,7 @@ files:
134
134
  - app/admin/c80_yax/x_c80_yax.rb
135
135
  - app/assets/images/c80_yax/cart_icon_sm.png
136
136
  - app/assets/images/c80_yax/lo.gif
137
+ - app/assets/images/c80_yax/stripe.png
137
138
  - app/assets/images/next_btn.png
138
139
  - app/assets/javascripts/c80_yax.js.coffee
139
140
  - app/assets/javascripts/c80_yax/backend/items.js
@@ -257,28 +258,48 @@ files:
257
258
  - db/migrate/20170707060000_create_c80_yax_join_table_items_items_similar.rb
258
259
  - db/seeds/c80_yax_01_fill_props.rb
259
260
  - engines/co/README.md
261
+ - engines/co/app/admin/co/order_messages.rb
260
262
  - engines/co/app/assets/javascripts/co.coffee
261
263
  - engines/co/app/assets/javascripts/co/_service/co_modal.js
262
264
  - engines/co/app/assets/javascripts/co/_service/cookies_service.js
263
265
  - engines/co/app/assets/javascripts/co/add_to_cart/actions/add_row_to_cart.js
266
+ - engines/co/app/assets/javascripts/co/add_to_cart/app.js
264
267
  - engines/co/app/assets/javascripts/co/add_to_cart/button_add_to_cart.js
265
- - engines/co/app/assets/javascripts/co/add_to_cart/data_order_row.js
266
268
  - engines/co/app/assets/javascripts/co/add_to_cart/service/collect_data_for_row.js
267
- - engines/co/app/assets/javascripts/co/add_to_cart/xapp.js
269
+ - engines/co/app/assets/javascripts/co/add_to_cart_sm/actions/add_row_to_cart_sm.js
270
+ - engines/co/app/assets/javascripts/co/add_to_cart_sm/app.js
271
+ - engines/co/app/assets/javascripts/co/add_to_cart_sm/button_add_to_cart_sm.js
272
+ - engines/co/app/assets/javascripts/co/add_to_cart_sm/service/collect_data_for_row_sm.js
268
273
  - engines/co/app/assets/javascripts/co/app.js
269
274
  - engines/co/app/assets/javascripts/co/cart_page/app.js
270
275
  - engines/co/app/assets/javascripts/co/cart_page/cart_page.js
271
276
  - engines/co/app/assets/javascripts/co/cart_page/cart_table.js
277
+ - engines/co/app/assets/javascripts/co/cart_page/message-order-form-ajax.js
272
278
  - engines/co/app/assets/javascripts/co/cart_page/support/row_maker.js
279
+ - engines/co/app/assets/javascripts/co/cart_page/support/row_printer.js
280
+ - engines/co/app/assets/javascripts/co/goto_cart/app.js
281
+ - engines/co/app/assets/javascripts/co/goto_cart/button_goto_cart.js
273
282
  - engines/co/app/assets/stylesheets/co.scss
274
283
  - engines/co/app/assets/stylesheets/co/cart_page/_cart_button.scss
275
284
  - engines/co/app/assets/stylesheets/co/cart_page/bottom_row.scss
276
285
  - engines/co/app/assets/stylesheets/co/cart_page/cart_table.scss
286
+ - engines/co/app/assets/stylesheets/co/cart_page/form.scss
277
287
  - engines/co/app/assets/stylesheets/co/modals/double_modal.scss
288
+ - engines/co/app/controllers/co/cart_controller.rb
278
289
  - engines/co/app/helpers/co/cart_page_helper.rb
279
290
  - engines/co/app/helpers/co/modals_helper.rb
291
+ - engines/co/app/mailers/co/order_message_mailer.rb
292
+ - engines/co/app/models/co/order_message.rb
293
+ - engines/co/app/models/co/order_message_validator.rb
280
294
  - engines/co/app/views/co/_cart_page.html.erb
295
+ - engines/co/app/views/co/cart/give_me_cart_order_form.js.erb
296
+ - engines/co/app/views/co/cart/message_cart_order.js.erb
297
+ - engines/co/app/views/co/cart/shared/_cart_order_form.html.erb
298
+ - engines/co/app/views/co/cart/shared/_ok_message.html.erb
281
299
  - engines/co/app/views/co/modals/_double_modal.html.erb
300
+ - engines/co/app/views/co/order_message_mailer/mail_mess.html.erb
301
+ - engines/co/config/routes.rb
302
+ - engines/co/db/migrate/20170723095252_create_co_order_messages.rb
282
303
  - engines/co/lib/co.rb
283
304
  - engines/co/lib/co/engine.rb
284
305
  - engines/co/lib/co/version.rb
@@ -1,16 +0,0 @@
1
- var DataOrderRow = function (){
2
- data = {
3
- id: 0,
4
- title: '',
5
- quantity: 0,
6
- color: '#ffffff',
7
- price: 0,
8
- image_url: '',
9
- item_url: '',
10
- mark_order: true,
11
- mark_metallic: false,
12
- mark_super_colors: false
13
- };
14
-
15
- return data;
16
- };