Suite
This commit is contained in:
parent
3fb90b3deb
commit
1fe09059c0
@ -37,10 +37,10 @@ class Public::ReseauxesController < ApplicationController
|
|||||||
redirect_to "http://localhost:3000/public/customers_auths/new?p="+@reseaux.token.to_s
|
redirect_to "http://localhost:3000/public/customers_auths/new?p="+@reseaux.token.to_s
|
||||||
|
|
||||||
else
|
else
|
||||||
redirect_to "http://negos.pro/public/customers_auths/new?p="+@reseaux.token.to_s
|
redirect_to "http://negos.olwen.xyz/public/customers_auths/new?p="+@reseaux.token.to_s
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
redirect_to "http://negos.pro"
|
redirect_to "http://negos.olwen.xyz"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -199,7 +199,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -174,7 +174,7 @@
|
|||||||
|
|
||||||
%tr
|
%tr
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td
|
%td
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -49,5 +49,5 @@
|
|||||||
.content= yield
|
.content= yield
|
||||||
|
|
||||||
.bottom{:style => "padding:10px;font-size:0.9em;"}
|
.bottom{:style => "padding:10px;font-size:0.9em;"}
|
||||||
=link_to image_tag("http://negos.pro/logo_mail.png", :style => "margin:20px auto;display:block;width:180px;max-width:100%;"), "http://negos.pro"
|
=link_to image_tag("http://negos.olwen.xyz/logo_mail.png", :style => "margin:20px auto;display:block;width:180px;max-width:100%;"), "http://negos.olwen.xyz"
|
||||||
|
|
@ -66,15 +66,15 @@
|
|||||||
=yield
|
=yield
|
||||||
-if !@my_reseauxes
|
-if !@my_reseauxes
|
||||||
.footer
|
.footer
|
||||||
=link_to "A propos", "http://negos.pro/negos-a-propos.html", :target => "_blank"
|
=link_to "A propos", "http://negos.olwen.xyz/negos-a-propos.html", :target => "_blank"
|
||||||
|
|
||||||
="-"
|
="-"
|
||||||
|
|
||||||
=link_to "CGU", "http://negos.pro/negos-conditions-generales-dutilisation.html", :target => "_blank"
|
=link_to "CGU", "http://negos.olwen.xyz/negos-conditions-generales-dutilisation.html", :target => "_blank"
|
||||||
|
|
||||||
="-"
|
="-"
|
||||||
|
|
||||||
=link_to "Mentions légales", "http://negos.pro/negos-mentions-legales.html", :target => "_blank"
|
=link_to "Mentions légales", "http://negos.olwen.xyz/negos-mentions-legales.html", :target => "_blank"
|
||||||
|
|
||||||
="-"
|
="-"
|
||||||
|
|
||||||
|
@ -46,10 +46,10 @@
|
|||||||
|
|
||||||
|
|
||||||
%center
|
%center
|
||||||
=link_to "Commander maintenant", "http://negos.pro/public/customers_auths/new?p=KJ6XC9", :target => "_blank", :style => "display:inline-block;margin:20px;padding:12px 20px;border:1px solid #f59c00;color:white;background:#f59c00;font-weight:bold;text-decoration:none;text-transform:uppercase;"
|
=link_to "Commander maintenant", "http://negos.olwen.xyz/public/customers_auths/new?p=KJ6XC9", :target => "_blank", :style => "display:inline-block;margin:20px;padding:12px 20px;border:1px solid #f59c00;color:white;background:#f59c00;font-weight:bold;text-decoration:none;text-transform:uppercase;"
|
||||||
|
|
||||||
|
|
||||||
=link_to image_tag( "/logo2.png", :style => "display:block;margin:20px auto;width:160px;"), "http://negos.pro", :target => "_blank"
|
=link_to image_tag( "/logo2.png", :style => "display:block;margin:20px auto;width:160px;"), "http://negos.olwen.xyz", :target => "_blank"
|
||||||
|
|
||||||
.columns
|
.columns
|
||||||
%h2
|
%h2
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
@ -197,7 +197,7 @@
|
|||||||
%tr
|
%tr
|
||||||
-if @product_order.reseaux_id != 19
|
-if @product_order.reseaux_id != 19
|
||||||
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
%td{:style => "width:135px;padding:0;vertical-align:middle"}
|
||||||
=image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
=image_tag "http://negos.olwen.xyz"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image
|
||||||
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
%td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s}
|
||||||
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
=simple_format product_order_product.archived_product.lang(:fr).bl_title
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user