diff --git a/app/controllers/public/reseauxes_controller.rb b/app/controllers/public/reseauxes_controller.rb index add97e4..37c9a56 100755 --- a/app/controllers/public/reseauxes_controller.rb +++ b/app/controllers/public/reseauxes_controller.rb @@ -37,10 +37,10 @@ class Public::ReseauxesController < ApplicationController redirect_to "http://localhost:3000/public/customers_auths/new?p="+@reseaux.token.to_s 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 else - redirect_to "http://negos.pro" + redirect_to "http://negos.olwen.xyz" end diff --git a/app/views/admin/product_order_documents/_general.html.haml b/app/views/admin/product_order_documents/_general.html.haml index 5ae2064..c428c3e 100644 --- a/app/views/admin/product_order_documents/_general.html.haml +++ b/app/views/admin/product_order_documents/_general.html.haml @@ -84,7 +84,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/admin/product_order_documents/_vs_bl.html.haml b/app/views/admin/product_order_documents/_vs_bl.html.haml index 893cdd5..17ec7eb 100644 --- a/app/views/admin/product_order_documents/_vs_bl.html.haml +++ b/app/views/admin/product_order_documents/_vs_bl.html.haml @@ -84,7 +84,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/admin/product_order_documents/_vsg_achats.html.haml b/app/views/admin/product_order_documents/_vsg_achats.html.haml index 5ae2064..c428c3e 100644 --- a/app/views/admin/product_order_documents/_vsg_achats.html.haml +++ b/app/views/admin/product_order_documents/_vsg_achats.html.haml @@ -84,7 +84,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/admin/product_order_documents/show.html.haml b/app/views/admin/product_order_documents/show.html.haml index 07d33a1..6b78e76 100644 --- a/app/views/admin/product_order_documents/show.html.haml +++ b/app/views/admin/product_order_documents/show.html.haml @@ -199,7 +199,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/admin/product_orders/bill.html.haml b/app/views/admin/product_orders/bill.html.haml index 3eda9c8..82cd026 100644 --- a/app/views/admin/product_orders/bill.html.haml +++ b/app/views/admin/product_orders/bill.html.haml @@ -174,7 +174,7 @@ %tr %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 =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/admin/product_orders/bl.html.haml b/app/views/admin/product_orders/bl.html.haml index 1e062ab..1571f7d 100644 --- a/app/views/admin/product_orders/bl.html.haml +++ b/app/views/admin/product_orders/bl.html.haml @@ -182,7 +182,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/layouts/mail.html.haml b/app/views/layouts/mail.html.haml index 6de244f..01c0c41 100755 --- a/app/views/layouts/mail.html.haml +++ b/app/views/layouts/mail.html.haml @@ -49,5 +49,5 @@ .content= yield .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" \ No newline at end of file diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index e09269b..f9828ea 100755 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -66,15 +66,15 @@ =yield -if !@my_reseauxes .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"    ="-"    diff --git a/app/views/layouts/vouisstar.html.haml b/app/views/layouts/vouisstar.html.haml index bbbde59..482474c 100644 --- a/app/views/layouts/vouisstar.html.haml +++ b/app/views/layouts/vouisstar.html.haml @@ -46,10 +46,10 @@ %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 %h2 diff --git a/app/views/public/product_order_documents/_vs_bl.html.haml b/app/views/public/product_order_documents/_vs_bl.html.haml index 67b17b5..7d9046d 100644 --- a/app/views/public/product_order_documents/_vs_bl.html.haml +++ b/app/views/public/product_order_documents/_vs_bl.html.haml @@ -84,7 +84,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/public/product_order_documents/_vsg_achats.html.haml b/app/views/public/product_order_documents/_vsg_achats.html.haml index 67b17b5..7d9046d 100644 --- a/app/views/public/product_order_documents/_vsg_achats.html.haml +++ b/app/views/public/product_order_documents/_vsg_achats.html.haml @@ -84,7 +84,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title diff --git a/app/views/public/product_order_documents/show.html.haml b/app/views/public/product_order_documents/show.html.haml index d33bae5..86f0ed8 100644 --- a/app/views/public/product_order_documents/show.html.haml +++ b/app/views/public/product_order_documents/show.html.haml @@ -197,7 +197,7 @@ %tr -if @product_order.reseaux_id != 19 %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} =simple_format product_order_product.archived_product.lang(:fr).bl_title