diff --git a/app/controllers/ps_admin/all_page_controller.rb b/app/controllers/ps_admin/all_page_controller.rb index 97af31b..a3216a9 100644 --- a/app/controllers/ps_admin/all_page_controller.rb +++ b/app/controllers/ps_admin/all_page_controller.rb @@ -90,7 +90,7 @@ module PsAdmin unless (@published_page = @all_page.published_page ) @published_page = PublishedPage.new - @published_page.priority = PublishedPage.all.size + 1 + @published_page.priority = PublishedPage.all.count + 1 @published_page.created_by = current_admin.id @published_page.created_at = Time.now end diff --git a/app/controllers/ps_admin/articles/all_page_controller.rb b/app/controllers/ps_admin/articles/all_page_controller.rb index 9375e38..e48352b 100644 --- a/app/controllers/ps_admin/articles/all_page_controller.rb +++ b/app/controllers/ps_admin/articles/all_page_controller.rb @@ -90,7 +90,7 @@ module PsAdmin @published_page.small_text = @all_page.small_text @published_page.full_text = @all_page.full_text @published_page.article_id = @all_page.article_id - @published_page.priority = PublishedPage.all.size + 1; + @published_page.priority = PublishedPage.all.count + 1 @published_page.updated_by = current_admin.id @published_page.updated_at = Time.now @published_page.created_by = current_admin.id diff --git a/app/controllers/ps_admin/image_controller.rb b/app/controllers/ps_admin/image_controller.rb index 894f044..445df83 100644 --- a/app/controllers/ps_admin/image_controller.rb +++ b/app/controllers/ps_admin/image_controller.rb @@ -13,11 +13,11 @@ module PsAdmin params[:images].each do |image| if @product.images.blank? @product.images.create(image: image, updated_by: current_admin.id, - position: @product.images.size + 1, + position: @product.images.count + 1, cover: true) else @product.images.create(image: image, updated_by: current_admin.id, - position: @product.images.size + 1) + position: @product.images.count + 1) end end end diff --git a/app/controllers/ps_admin/product_controller.rb b/app/controllers/ps_admin/product_controller.rb index 84bb412..4fee745 100644 --- a/app/controllers/ps_admin/product_controller.rb +++ b/app/controllers/ps_admin/product_controller.rb @@ -34,11 +34,11 @@ module PsAdmin params[:images].each do |image| if @product.images.blank? @product.images.create(image: image, updated_by: current_admin.id, - position: @product.images.size + 1, + position: @product.images.count + 1, cover: true) else @product.images.create(image: image, updated_by: current_admin.id, - position: @product.images.size + 1) + position: @product.images.count + 1) end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1d62aab..2db0241 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -19,7 +19,7 @@ module ApplicationHelper ret = '' categories.each do |node| ret += '
  • ' - size = node.active_childrens.size + size = node.active_childrens.count if size.zero? ret += link_to(node.name, category_path(node)) else diff --git a/app/views/cart/add_to_cart.js.erb b/app/views/cart/add_to_cart.js.erb index 495e15b..76438ca 100644 --- a/app/views/cart/add_to_cart.js.erb +++ b/app/views/cart/add_to_cart.js.erb @@ -1,3 +1,3 @@ $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>"); -$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)"); +$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)"); $.notify('<%= @message[1] %>', '<%= @message[0] %>'); diff --git a/app/views/cart/clear.js.erb b/app/views/cart/clear.js.erb index 9688f2d..8da8dc5 100644 --- a/app/views/cart/clear.js.erb +++ b/app/views/cart/clear.js.erb @@ -1,4 +1,4 @@ $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>"); -$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)"); +$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)"); $("#ps_cart_summary_items").html("<%= escape_javascript(render('/cart/partials/cart_summary_products')) %>"); $.notify("Koszyk został wyczyszczony", "warn"); diff --git a/app/views/cart/remove_from_cart.js.erb b/app/views/cart/remove_from_cart.js.erb index 3ff7351..0fe6c34 100644 --- a/app/views/cart/remove_from_cart.js.erb +++ b/app/views/cart/remove_from_cart.js.erb @@ -1,5 +1,5 @@ $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>"); -$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)"); +$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)"); <% if params[:ca] == 'cart' %> $("#ps_cart_summary_items").html("<%= escape_javascript(render(partial: '/cart/partials/cart_summary_products', locals: { ca: 'cart' })) %>"); <% elsif params[:ca] == 'order' %> diff --git a/app/views/category/show.html.erb b/app/views/category/show.html.erb index ed2be56..cb4255b 100644 --- a/app/views/category/show.html.erb +++ b/app/views/category/show.html.erb @@ -1,5 +1,5 @@ <%= render '/product/partials/product_modal' %> -<% if @category.active_childrens.size > 0 %> +<% if @category.active_childrens.count > 0 %>

    Kategorie

    @@ -37,7 +37,7 @@ <% end %> <% end %> -<% if @products.size > 0 %> +<% if @products.count > 0 %>

    Produkty

    diff --git a/app/views/checkout/end_order.js.erb b/app/views/checkout/end_order.js.erb index a39fea4..176677a 100644 --- a/app/views/checkout/end_order.js.erb +++ b/app/views/checkout/end_order.js.erb @@ -1,10 +1,10 @@ <% if @order_complete.eql?(true) %> $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>"); - $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)"); + $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)"); $("#main_container").html("<%= escape_javascript(render(partial: '/checkout/partials/order_confirmation')) %>"); <% elsif @order_complete.eql?(false) %> $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>"); - $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)"); + $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)"); $("#main_container").html("<%= escape_javascript(render(partial: '/checkout/partials/order_error')) %>"); <% else %> $('#error').html("<%= escape_javascript(raw @message[1]) %>"); diff --git a/app/views/checkout/order.html.erb b/app/views/checkout/order.html.erb index 0ea3ee5..d585b5f 100644 --- a/app/views/checkout/order.html.erb +++ b/app/views/checkout/order.html.erb @@ -4,7 +4,7 @@
    -<% if @cart.blank? || @cart.cart_products.size == 0 %> +<% if @cart.blank? || @cart.cart_products.count == 0 %>
    <%= render partial: '/checkout/partials/order_error' %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index efbc84a..192f915 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -69,7 +69,7 @@ diff --git a/app/views/product/partials/_index.html.erb b/app/views/product/partials/_index.html.erb index 03d5dc0..a5d346a 100644 --- a/app/views/product/partials/_index.html.erb +++ b/app/views/product/partials/_index.html.erb @@ -1,5 +1,5 @@ <%= render '/product/partials/product_modal' %> -<% if @products.size > 0 %> +<% if @products.count > 0 %>

    Produkty

    diff --git a/app/views/ps_admin/article/_articles.html.erb b/app/views/ps_admin/article/_articles.html.erb index d29e092..21e7e1a 100644 --- a/app/views/ps_admin/article/_articles.html.erb +++ b/app/views/ps_admin/article/_articles.html.erb @@ -16,8 +16,8 @@ <% for ap in @articles %> <%= link_to ap.name, {controller: '/ps_admin/article', action: 'show', id: ap.id} %> - <%= raw('' + ap.all_page_articles.size.to_s + '') %> - <%= raw('' + ap.published_page_articles.size.to_s + '') %> + <%= raw('' + ap.all_page_articles.count.to_s + '') %> + <%= raw('' + ap.published_page_articles.count.to_s + '') %> <%= ap.updated_at %> <%= link_to raw(' Edycja'), {controller: '/ps_admin/article', action: 'edit', id: ap.id}, class: 'btn btn-xs btn-info', remote: true %> diff --git a/app/views/ps_admin/category/_categories.html.erb b/app/views/ps_admin/category/_categories.html.erb index 1732ab0..2279a90 100644 --- a/app/views/ps_admin/category/_categories.html.erb +++ b/app/views/ps_admin/category/_categories.html.erb @@ -28,9 +28,9 @@ <% end %> <%= link_to cat.name, {controller: '/ps_admin/category', action: 'index', parent_id: cat.id} %> - <%= raw('' + cat.children.size.to_s + '') %> - <%= raw('' + cat.products.size.to_s + '') %> - <%= raw('' + cat.active_products.size.to_s + '') %> + <%= raw('' + cat.children.count.to_s + '') %> + <%= raw('' + cat.products.count.to_s + '') %> + <%= raw('' + cat.active_products.count.to_s + '') %> <%= raw cat.active.eql?(true) ? link_to(raw(''), {controller: '/ps_admin/category', action: 'set_active', id: cat.id, active: 0}, remote: true) : link_to(raw(''), {controller: '/ps_admin/category', action: 'set_active', id: cat.id, active: 1}, remote: true) %> diff --git a/app/views/ps_admin/image/partials/_images.html.erb b/app/views/ps_admin/image/partials/_images.html.erb index 4b3e0bf..93f94d1 100644 --- a/app/views/ps_admin/image/partials/_images.html.erb +++ b/app/views/ps_admin/image/partials/_images.html.erb @@ -21,7 +21,7 @@ <% else %> <%= link_to raw(''), {controller: '/ps_admin/image', action: 'pos_up', id: image.id, product_id: @product.id}, class: 'btn btn-xs btn-success', remote: true, title: 'Do góry' %> <% end %> - <% if image.position >= @product.images.size %> + <% if image.position >= @product.images.count %> <%= link_to raw(''), '#', class: 'btn btn-xs btn-primary', remote: true, title: 'W dół', disabled: 'disabled' %> <% else %> <%= link_to raw(''), {controller: '/ps_admin/image', action: 'pos_down', id: image.id, product_id: @product.id}, class: 'btn btn-xs btn-primary', remote: true, title: 'W dół' %>