From e818719f40dfe06d4685b47d3641eeea6681a0a1 Mon Sep 17 00:00:00 2001 From: salman Date: Mon, 20 Jun 2016 08:33:02 +0500 Subject: [PATCH 1/3] No message --- app/controllers/api/v1/orders_controller.rb | 1 + app/controllers/orders_controller.rb | 26 +++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/v1/orders_controller.rb b/app/controllers/api/v1/orders_controller.rb index 8c45a4d..7564b51 100644 --- a/app/controllers/api/v1/orders_controller.rb +++ b/app/controllers/api/v1/orders_controller.rb @@ -2,6 +2,7 @@ class Api::V1::OrdersController < ApiController before_action :get_device_table_mapping, only: [:create] def create + #binding.pry order_time = DateTime.strptime(params[:order_time].to_s,'%s') @order = Order.create(name: params[:name], phone: params[:phone], address: params[:address], order_total: params[:order_total], order_time: order_time, restaurant_owner_id: @user.id, device_table_mapping_id: @device.first.id) order_detail = params[:order_detail] diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 0da1f67..e4d077d 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -30,15 +30,21 @@ def full_screen def update_status @order = Order.where(id: params[:id]) - if @order.any? - @order = @order.first - @order.status = params[:status] - @order.save - end - - log=OrderLog.new(:status=>params[:status],:order_id=> @order.id,:restaurant_owner_id=> @order.restaurant_owner_id) - log.save - - respond_to :js + begin + if @order.any? + @order = @order.first + @order.status = params[:status] + @order.save + end + + log = OrderLog.create(status: params[:status],order_id: @order.id,restaurant_owner_id: @order.restaurant_owner_id) + log.save + + respond_to :js + rescue + flash[:fail] = "Status cannot be updated" + render 'index' + + end end end From 6571336607d8f50600c2de534baa8d328ecbaff2 Mon Sep 17 00:00:00 2001 From: salman Date: Mon, 20 Jun 2016 08:56:52 +0500 Subject: [PATCH 2/3] UUID has been added to categories & menus table --- db/schema.rb | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 8022605..6563843 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,19 +15,21 @@ # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + enable_extension "uuid-ossp" create_table "categories", force: :cascade do |t| t.string "name" t.integer "restaurant_owner_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "image" - t.boolean "dirty", default: false, null: false + t.boolean "dirty", default: false, null: false t.integer "parent_id" - t.integer "lft", default: 0, null: false - t.integer "rgt", default: 0, null: false - t.integer "depth", default: 0, null: false - t.integer "children_count", default: 0, null: false + t.integer "lft", default: 0, null: false + t.integer "rgt", default: 0, null: false + t.integer "depth", default: 0, null: false + t.integer "children_count", default: 0, null: false + t.uuid "uuid", default: "uuid_generate_v4()" end create_table "device_table_mappings", force: :cascade do |t| @@ -67,12 +69,13 @@ t.text "description" t.integer "restaurant_owner_id" t.integer "category_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "approved", default: true, null: false - t.boolean "dirty", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "approved", default: true, null: false + t.boolean "dirty", default: false, null: false t.float "original_price" t.string "serving" + t.uuid "uuid", default: "uuid_generate_v4()" end add_index "menus", ["approved"], name: "index_menus_on_approved", using: :btree From 2418b10d53cbef45f341e9ca690b5d0fd404c3cf Mon Sep 17 00:00:00 2001 From: salman Date: Wed, 22 Jun 2016 13:16:05 +0500 Subject: [PATCH 3/3] UUID mistake reverted --- .../20160609095604_enable_uuid_extension.rb | 5 ++++ .../20160609100545_add_uuid_to_categories.rb | 5 ++++ .../20160609100553_add_uuid_to_menus.rb | 5 ++++ db/schema.rb | 25 ++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20160609095604_enable_uuid_extension.rb create mode 100644 db/migrate/20160609100545_add_uuid_to_categories.rb create mode 100644 db/migrate/20160609100553_add_uuid_to_menus.rb diff --git a/db/migrate/20160609095604_enable_uuid_extension.rb b/db/migrate/20160609095604_enable_uuid_extension.rb new file mode 100644 index 0000000..0da8023 --- /dev/null +++ b/db/migrate/20160609095604_enable_uuid_extension.rb @@ -0,0 +1,5 @@ +class EnableUuidExtension < ActiveRecord::Migration + def change + enable_extension 'uuid-ossp' + end +end diff --git a/db/migrate/20160609100545_add_uuid_to_categories.rb b/db/migrate/20160609100545_add_uuid_to_categories.rb new file mode 100644 index 0000000..f67a680 --- /dev/null +++ b/db/migrate/20160609100545_add_uuid_to_categories.rb @@ -0,0 +1,5 @@ +class AddUuidToCategories < ActiveRecord::Migration + def change + add_column :categories, :uuid, :uuid, default: 'uuid_generate_v4()' + end +end diff --git a/db/migrate/20160609100553_add_uuid_to_menus.rb b/db/migrate/20160609100553_add_uuid_to_menus.rb new file mode 100644 index 0000000..dd240f0 --- /dev/null +++ b/db/migrate/20160609100553_add_uuid_to_menus.rb @@ -0,0 +1,5 @@ +class AddUuidToMenus < ActiveRecord::Migration + def change + add_column :menus, :uuid, :uuid, default: 'uuid_generate_v4()' + end +end diff --git a/db/schema.rb b/db/schema.rb index 6563843..8022605 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,21 +15,19 @@ # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "uuid-ossp" create_table "categories", force: :cascade do |t| t.string "name" t.integer "restaurant_owner_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "image" - t.boolean "dirty", default: false, null: false + t.boolean "dirty", default: false, null: false t.integer "parent_id" - t.integer "lft", default: 0, null: false - t.integer "rgt", default: 0, null: false - t.integer "depth", default: 0, null: false - t.integer "children_count", default: 0, null: false - t.uuid "uuid", default: "uuid_generate_v4()" + t.integer "lft", default: 0, null: false + t.integer "rgt", default: 0, null: false + t.integer "depth", default: 0, null: false + t.integer "children_count", default: 0, null: false end create_table "device_table_mappings", force: :cascade do |t| @@ -69,13 +67,12 @@ t.text "description" t.integer "restaurant_owner_id" t.integer "category_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "approved", default: true, null: false - t.boolean "dirty", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "approved", default: true, null: false + t.boolean "dirty", default: false, null: false t.float "original_price" t.string "serving" - t.uuid "uuid", default: "uuid_generate_v4()" end add_index "menus", ["approved"], name: "index_menus_on_approved", using: :btree