From 5238a52533ebeea03828dd004018cfd695f2f080 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 25 Mar 2018 23:36:03 +0200 Subject: [PATCH] suite --- app/controllers/public/product_orders_controller.rb | 6 ++++++ app/models/product_order.rb | 1 + .../20180325210006_add_reseaux_id_to_product_orders.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180325210006_add_reseaux_id_to_product_orders.rb diff --git a/app/controllers/public/product_orders_controller.rb b/app/controllers/public/product_orders_controller.rb index a765d83..642abed 100755 --- a/app/controllers/public/product_orders_controller.rb +++ b/app/controllers/public/product_orders_controller.rb @@ -17,6 +17,12 @@ class Public::ProductOrdersController < ApplicationController def my_cart get_reseaux + + if !@product_order.reseaux + @product_order.reseaux = @reseaux + @product_order.save + end + end def vourcher diff --git a/app/models/product_order.rb b/app/models/product_order.rb index fc79652..ff2c364 100755 --- a/app/models/product_order.rb +++ b/app/models/product_order.rb @@ -1,4 +1,5 @@ class ProductOrder < ActiveRecord::Base + belongs_to :reseaux has_many :payments, :as => :element diff --git a/db/migrate/20180325210006_add_reseaux_id_to_product_orders.rb b/db/migrate/20180325210006_add_reseaux_id_to_product_orders.rb new file mode 100644 index 0000000..a70e625 --- /dev/null +++ b/db/migrate/20180325210006_add_reseaux_id_to_product_orders.rb @@ -0,0 +1,5 @@ +class AddReseauxIdToProductOrders < ActiveRecord::Migration + def change + add_column :product_orders, :reseaux_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 682dd3a..3253e13 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180301225428) do +ActiveRecord::Schema.define(version: 20180325210006) do create_table "abonnements", force: :cascade do |t| t.integer "abonnement_type_id", limit: 4 @@ -899,6 +899,7 @@ ActiveRecord::Schema.define(version: 20180301225428) do t.integer "bl_index", limit: 4 t.integer "bl_year", limit: 4 t.boolean "shiped", limit: 1 + t.integer "reseaux_id", limit: 4 end create_table "product_product_sizes", force: :cascade do |t|