Adding payment method
This commit is contained in:
@@ -1,2 +1,14 @@
|
|||||||
class DeliveryDestination < ActiveRecord::Base
|
class DeliveryDestination < ActiveRecord::Base
|
||||||
|
def get_payment_string
|
||||||
|
case self.payment_method
|
||||||
|
when 'cash_on_delivery'
|
||||||
|
'Pouzecem'
|
||||||
|
when 'paypal'
|
||||||
|
'Paypal'
|
||||||
|
when 'pikpay'
|
||||||
|
'Pikpay'
|
||||||
|
else
|
||||||
|
'Nepoznato'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ Bosna i Hercegovina<br /><br />
|
|||||||
<p><strong>Telefon: </strong> +387 <%= dd.phone %><br /><br />
|
<p><strong>Telefon: </strong> +387 <%= dd.phone %><br /><br />
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p><strong>Plaćanje: </strong><%= dd.get_payment_string %></p><br />
|
||||||
|
|
||||||
<p><strong>Napomena: </strong><br />
|
<p><strong>Napomena: </strong><br />
|
||||||
<%= dd.note %><br /><br />
|
<%= dd.note %><br /><br />
|
||||||
</p>
|
</p>
|
||||||
@@ -73,12 +75,3 @@ OVO JE NARUDŽBA ZA INSTANT DOSTAVU
|
|||||||
|
|
||||||
</table>
|
</table>
|
||||||
<br /><br />
|
<br /><br />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class AddPaymentMethodToDeliveryDestination < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :delivery_destinations, :payment_method, :string, default: 'cash_on_delivery'
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20151124061357) do
|
ActiveRecord::Schema.define(version: 20160108081208) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@@ -62,11 +62,12 @@ ActiveRecord::Schema.define(version: 20151124061357) do
|
|||||||
t.boolean "phone_verified"
|
t.boolean "phone_verified"
|
||||||
t.string "phone_verification_code"
|
t.string "phone_verification_code"
|
||||||
t.string "email_verification_code"
|
t.string "email_verification_code"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "user_id"
|
t.integer "user_id"
|
||||||
t.string "anonymous_id_string"
|
t.string "anonymous_id_string"
|
||||||
t.boolean "instant_delivery", default: false
|
t.boolean "instant_delivery", default: false
|
||||||
|
t.string "payment_method", default: "cash_on_delivery"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "delivery_time_estimations", force: :cascade do |t|
|
create_table "delivery_time_estimations", force: :cascade do |t|
|
||||||
|
|||||||
@@ -11,4 +11,17 @@ class DeliveryDestination < ActiveRecord::Base
|
|||||||
result = DeliveryDestination.create!(attributes)
|
result = DeliveryDestination.create!(attributes)
|
||||||
return result
|
return result
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_payment_string
|
||||||
|
case self.payment_method
|
||||||
|
when 'cash_on_delivery'
|
||||||
|
'Pouzecem'
|
||||||
|
when 'paypal'
|
||||||
|
'Paypal'
|
||||||
|
when 'pikpay'
|
||||||
|
'Pikpay'
|
||||||
|
else
|
||||||
|
'Nepoznato'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ Bosna i Hercegovina
|
|||||||
|
|
||||||
**Telefon: ** +387 <%= dd.phone %>
|
**Telefon: ** +387 <%= dd.phone %>
|
||||||
|
|
||||||
|
**Plaćanje: ** <%= dd.get_payment_string %>
|
||||||
|
|
||||||
**Napomena: **
|
**Napomena: **
|
||||||
<%= dd.note %>
|
<%= dd.note %>
|
||||||
|
|
||||||
@@ -41,12 +43,3 @@ Dostava
|
|||||||
**UKUPNO:** <%= Helper.money(c.total) %>
|
**UKUPNO:** <%= Helper.money(c.total) %>
|
||||||
|
|
||||||
[Pogledati OVAJ LINK](https://www.ribica.ba/backoffice/carts/<%= @cart.id %>)
|
[Pogledati OVAJ LINK](https://www.ribica.ba/backoffice/carts/<%= @cart.id %>)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user