nicolas/negos_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2019-04-29 12:01:35 +02:00
parent 6036a5cbec
commit 512eb7346a
4 changed files with 82 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/products/_form.html.haml
View File

@ -3,6 +3,8 @@
.content .content
=form.input :reseaux_id, :label => "Réseau :", :collection => Reseaux.where(:parent_id => nil).all, :as => :select, :include_blank => false =form.input :reseaux_id, :label => "Réseau :", :collection => Reseaux.where(:parent_id => nil).all, :as => :select, :include_blank => false
=form.input :orderable, :label => "Peut être commandé ?", :as => :boolean
=#form.input :product_category_id, :label => "Catégorie :", :collection => @categories_select, :as => :select, :include_blank => false =#form.input :product_category_id, :label => "Catégorie :", :collection => @categories_select, :as => :select, :include_blank => false
-if @product.product_category_id -if @product.product_category_id

144
app/views/public/products/show.html.haml
View File

@ -50,102 +50,102 @@
-@porduct_order_product.product_size_id = @product.product_sizes_in_stock(@porduct_order_product.product_option_id).first.id if @product.product_sizes_in_stock(@porduct_order_product.product_option_id).first -@porduct_order_product.product_size_id = @product.product_sizes_in_stock(@porduct_order_product.product_option_id).first.id if @product.product_sizes_in_stock(@porduct_order_product.product_option_id).first
-if @product.orderable
-if @product.product_stocks.where("stock_th > 0").count > 0
= form_for [:public, @porduct_order_product], :remote => true do |f|
= f.hidden_field :product_id
-if @product.product_stocks.where("stock_th > 0").count > 0 .product_options
= form_for [:public, @porduct_order_product], :remote => true do |f| -@product.product_options_in_stock.each do |product_option|
= f.hidden_field :product_id
.product_options =link_to product_option.lang(I18n.locale).name, "#", :onclick => "$('#product_option_id').val($(this).data('id'));option_active();update_size_in_stocks($(this).data('sizes-in-stock'));return false;", :data => {:id => product_option.id, :sizes_in_stock => @product.product_sizes_in_stock_id(product_option.id)}, :id => "product_option_link_#{product_option.id}", :class => "product_option_link"
-@product.product_options_in_stock.each do |product_option|
=link_to product_option.lang(I18n.locale).name, "#", :onclick => "$('#product_option_id').val($(this).data('id'));option_active();update_size_in_stocks($(this).data('sizes-in-stock'));return false;", :data => {:id => product_option.id, :sizes_in_stock => @product.product_sizes_in_stock_id(product_option.id)}, :id => "product_option_link_#{product_option.id}", :class => "product_option_link"
= f.hidden_field :product_option_id, :id => "product_option_id" = f.hidden_field :product_option_id, :id => "product_option_id"
#product_sizes.product_sizes #product_sizes.product_sizes
-@product.product_sizes_in_stock(:all).each do |product_size| -@product.product_sizes_in_stock(:all).each do |product_size|
=link_to product_size.name, "#", :onclick => "$('#product_size_id').val($(this).data('id'));size_active();return false;", :data => {:id => product_size.id }, :id => "product_size_link_#{product_size.id}", :class => "product_size_link "+("in_stock" if @product.product_sizes_in_stock_id(@porduct_order_product.product_option_id).include?(product_size.id)).to_s =link_to product_size.name, "#", :onclick => "$('#product_size_id').val($(this).data('id'));size_active();return false;", :data => {:id => product_size.id }, :id => "product_size_link_#{product_size.id}", :class => "product_size_link "+("in_stock" if @product.product_sizes_in_stock_id(@porduct_order_product.product_option_id).include?(product_size.id)).to_s
= f.hidden_field :product_size_id, :id => "product_size_id" = f.hidden_field :product_size_id, :id => "product_size_id"
= f.submit "Ajouter à la commande", :class => "add_to_cart btn" = f.submit "Ajouter à la commande", :class => "add_to_cart btn"
%br %br
%br %br
%div %div
.clock{:style => "margin:2em;display:inline-block;width:auto;margin:0;margin-left:-5px;"} .clock{:style => "margin:2em;display:inline-block;width:auto;margin:0;margin-left:-5px;"}
<script type="text/javascript"> <script type="text/javascript">
=raw "var clock_max = #{nbr_products};" =raw "var clock_max = #{nbr_products};"
</script> </script>
:javascript :javascript
var countup; var countup;
var clock = $('.clock').FlipClock(0, { var clock = $('.clock').FlipClock(0, {
clockFace: 'Counter', clockFace: 'Counter',
minimumDigits: 1, minimumDigits: 1,
callbacks:{ callbacks:{
init:function (){ init:function (){
}
} }
} });
}); if(clock_max > 0){
if(clock_max > 0){ countup = setInterval(function() {
countup = setInterval(function() { clock.increment();
clock.increment(); if(clock.getTime().time >= clock_max) {
if(clock.getTime().time >= clock_max) { clock.stop();
clock.stop(); clearInterval(countup);
clearInterval(countup); }
} }, 0);}
}, 0);} %div{:style => "padding:10px 15px;display:inline-block;text-transform:uppercase;font-weight:bold;font-size:25px;line-height:30px;position:relative;top:-10px;padding-left:3px;"}
%div{:style => "padding:10px 15px;display:inline-block;text-transform:uppercase;font-weight:bold;font-size:25px;line-height:30px;position:relative;top:-10px;padding-left:3px;"} déjà
déjà %br
%br commandés
commandés %br
%br depuis 2018
depuis 2018
:coffeescript :coffeescript
@size_active = -> @size_active = ->
$(".product_size_link").removeClass("active") $(".product_size_link").removeClass("active")
$("#product_size_link_"+ $("#product_size_id").val()).addClass("active") $("#product_size_link_"+ $("#product_size_id").val()).addClass("active")
:javascript :javascript
size_active(); size_active();
:coffeescript :coffeescript
@option_active = -> @option_active = ->
$(".product_option_link").removeClass("active") $(".product_option_link").removeClass("active")
$("#product_option_link_"+ $("#product_option_id").val()).addClass("active") $("#product_option_link_"+ $("#product_option_id").val()).addClass("active")
:javascript :javascript
option_active(); option_active();
:coffeescript :coffeescript
@update_size_in_stocks =(ids) -> @update_size_in_stocks =(ids) ->
$(".product_size_link").removeClass("in_stock") $(".product_size_link").removeClass("in_stock")
$.each ids, (index, value) -> $.each ids, (index, value) ->
$("#product_size_link_"+ value).addClass("in_stock") $("#product_size_link_"+ value).addClass("in_stock")
$(".in_stock").first().click() $(".in_stock").first().click()
:javascript :javascript
//update_size_in_stocks([1,2]); //update_size_in_stocks([1,2]);
:scss :scss
.product_sizes a{ .product_sizes a{
display:none; display:none;
&.in_stock{ &.in_stock{
display:inline-block; display:inline-block;
}
} }
}
-else -else
.no_stock .no_stock
Ce produit n'est plus en stock. Ce produit n'est plus en stock.

4
app/views/public/shared/_sub_menu.html.haml
View File

@ -4,9 +4,9 @@
-if current_customer.account_validated? -if current_customer.account_validated?
-if @reseaux and @reseaux.needs_enabled -if @reseaux and @reseaux.needs_enabled
=link_to "Besoins spécifiques", public_needs_path(:type => 1), :class => ("active" if @needs and params[:type].to_i == 1) =link_to "Besoins exclusifs", public_needs_path(:type => 1), :class => ("active" if @needs and params[:type].to_i == 1)
-if @reseaux and @reseaux.centrale_enabled -if @reseaux and @reseaux.centrale_enabled
=link_to "Centrale d'achats", public_needs_path(:type => 2), :class => ("active" if @needs and params[:type].to_i == 2) =link_to "Portail local", public_needs_path(:type => 2), :class => ("active" if @needs and params[:type].to_i == 2)
-if session[:reseaux_id].to_i > 0 -if session[:reseaux_id].to_i > 0
-if @reseaux and @reseaux.offres_enabled -if @reseaux and @reseaux.offres_enabled

5
db/migrate/20190429095601_add_orderable_to_products.rb Normal file
View File

@ -0,0 +1,5 @@
class AddOrderableToProducts < ActiveRecord::Migration
def change
add_column :products, :orderable, :boolean, :default => true
end
end