This commit is contained in:
adam.harbas@a-net.ba
2016-01-11 09:51:59 +01:00
383 changed files with 210 additions and 135482 deletions

View File

@@ -103,23 +103,42 @@ post '/cart/confirmation' do
end
post '/payment/confirmation' do
data = param[:custom]
anonymus = data[:anonymous_id_string]
user = data[:user_id]
data = JSON.parse params[:custom]
cart = Cart.just_find(anonymus, user)
allowed_keys = ["name", "address", "place", "postal_code", "phone", "email", "note"]
params = data.reject { |key,_| !allowed_keys.include?(key) }
cart.delivery_destination.update_attributes(params)
cart.delivery_destination.save!
puts "Data #{data.inspect}"
anonymous = data["anonymous_id_string"]
user = data["user_id"]
user ||= -1
user = user.to_i
cart = Cart.just_find(anonymous, user)
if cart.item_in_carts.length > 0
cart.ordered = true
cart.save!
end
Cart.find_or_create(anonymous, logged_in_user_id)
Cart.find_or_create(anonymous, user)
report_to_trello(cart)
send_order_email(cart)
"OK".to_json
end
get '/pikpay/confirmation' do
anonymous = params["anonymous_id_string"]
user = params["user_id"]
user ||= -1
user = user.to_i
cart = Cart.just_find(anonymous, user)
if cart.item_in_carts.length > 0
cart.ordered = true
cart.save!
end
Cart.find_or_create(anonymous, user)
report_to_trello(cart)
send_order_email(cart)
redirect "http://localhost:3001/hvala"
end

View File

@@ -0,0 +1,5 @@
class AddPaymentMethodToDeliveryDestination < ActiveRecord::Migration
def change
add_column :delivery_destinations, :payment_method, :string
end
end

View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160108081208) do
ActiveRecord::Schema.define(version: 20160111024541) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -67,7 +67,7 @@ ActiveRecord::Schema.define(version: 20160108081208) do
t.integer "user_id"
t.string "anonymous_id_string"
t.boolean "instant_delivery", default: false
t.string "payment_method", default: "cash_on_delivery"
t.string "payment_method"
end
create_table "delivery_time_estimations", force: :cascade do |t|