comable_frontend 0.3.4 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/comable/carts_controller.rb +3 -3
- data/app/controllers/comable/orders_controller.rb +14 -8
- data/app/controllers/comable/{customers_controller.rb → users_controller.rb} +7 -7
- data/app/controllers/concerns/comable/payment_action.rb +1 -1
- data/app/controllers/concerns/comable/shipment_action.rb +1 -1
- data/app/controllers/concerns/comable/signin_action.rb +2 -2
- data/app/views/comable/carts/show.slim +7 -7
- data/app/views/comable/orders/confirm.slim +18 -13
- data/app/views/comable/orders/create.slim +2 -2
- data/app/views/comable/orders/delivery.slim +2 -2
- data/app/views/comable/orders/orderer.slim +2 -2
- data/app/views/comable/orders/payment.slim +9 -7
- data/app/views/comable/orders/shipment.slim +8 -6
- data/app/views/comable/shared/_header.slim +6 -6
- data/app/views/comable/shared/_tracker.slim +2 -0
- data/app/views/comable/{customers → users}/_address.slim +4 -4
- data/app/views/comable/{customers → users}/addresses.slim +13 -13
- data/app/views/comable/{customers → users}/show.slim +11 -11
- data/app/views/layouts/comable/application.slim +2 -0
- data/config/routes.rb +2 -2
- metadata +9 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 13ecbfa67267db1145552c73f094a493ab4c814c
|
4
|
+
data.tar.gz: 9b9caa79004f6b389defef7c8800747de04b3712
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bf20628913312b17932660dfb42384a79ca54e3253437d91d73510e4eefa81ea0082269ba7bdb849833d8923de8d7e94d4a37e6872ba7b3c18ed2088185914ce
|
7
|
+
data.tar.gz: 194965bec47e14257334e9e7260760a1a83a928c898363c77809e38ab201beef0a3fe2d86a054a429fe17f6d3a13a783aef6929e597b7e314d861c6e29d3f990
|
@@ -4,7 +4,7 @@ module Comable
|
|
4
4
|
before_filter :ensure_found_cart_item, only: [:add, :update]
|
5
5
|
|
6
6
|
def add
|
7
|
-
if
|
7
|
+
if current_comable_user.add_cart_item(@cart_item, cart_item_options)
|
8
8
|
redirect_to comable.cart_path, notice: Comable.t('carts.added')
|
9
9
|
else
|
10
10
|
flash.now[:alert] = Comable.t('carts.invalid')
|
@@ -13,7 +13,7 @@ module Comable
|
|
13
13
|
end
|
14
14
|
|
15
15
|
def update
|
16
|
-
if
|
16
|
+
if current_comable_user.reset_cart_item(@cart_item, cart_item_options)
|
17
17
|
redirect_to comable.cart_path, notice: Comable.t('carts.updated')
|
18
18
|
else
|
19
19
|
flash.now[:alert] = Comable.t('carts.invalid')
|
@@ -25,7 +25,7 @@ module Comable
|
|
25
25
|
cart_item = find_cart_item
|
26
26
|
return redirect_by_product_not_found unless cart_item
|
27
27
|
|
28
|
-
if
|
28
|
+
if current_comable_user.reset_cart_item(cart_item)
|
29
29
|
redirect_to comable.cart_path, notice: Comable.t('carts.updated')
|
30
30
|
else
|
31
31
|
flash.now[:alert] = Comable.t('carts.invalid')
|
@@ -4,6 +4,7 @@ module Comable
|
|
4
4
|
before_filter :load_order
|
5
5
|
before_filter :ensure_cart_not_empty
|
6
6
|
before_filter :ensure_saleable_stocks
|
7
|
+
before_filter :ensure_correct_flow, only: :create
|
7
8
|
|
8
9
|
prepend Comable::SigninAction
|
9
10
|
prepend Comable::ShipmentAction
|
@@ -27,13 +28,13 @@ module Comable
|
|
27
28
|
end
|
28
29
|
|
29
30
|
def create
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
31
|
+
@order.next_state!
|
32
|
+
|
33
|
+
flash.now[:notice] = Comable.t('orders.success')
|
34
|
+
send_order_complete_mail
|
35
|
+
rescue ActiveRecord::RecordInvalid
|
36
|
+
flash[:alert] = @order.errors.full_messages.join
|
37
|
+
redirect_to next_order_path
|
37
38
|
end
|
38
39
|
|
39
40
|
private
|
@@ -48,7 +49,7 @@ module Comable
|
|
48
49
|
end
|
49
50
|
|
50
51
|
def ensure_cart_not_empty
|
51
|
-
return if
|
52
|
+
return if current_comable_user.cart.any?
|
52
53
|
flash[:alert] = Comable.t('carts.empty')
|
53
54
|
redirect_to comable.cart_path
|
54
55
|
end
|
@@ -59,6 +60,11 @@ module Comable
|
|
59
60
|
redirect_to comable.cart_path
|
60
61
|
end
|
61
62
|
|
63
|
+
def ensure_correct_flow
|
64
|
+
return if @order.state?(:confirm)
|
65
|
+
redirect_to next_order_path
|
66
|
+
end
|
67
|
+
|
62
68
|
def load_order
|
63
69
|
@order = current_order
|
64
70
|
@order.attributes = order_params if order_params
|
@@ -1,16 +1,16 @@
|
|
1
1
|
module Comable
|
2
|
-
class
|
2
|
+
class UsersController < Comable::ApplicationController
|
3
3
|
include Comable::PermittedAttributes
|
4
4
|
|
5
|
-
before_filter :
|
5
|
+
before_filter :authenticate_user!
|
6
6
|
|
7
7
|
def show
|
8
|
-
@orders =
|
8
|
+
@orders = current_comable_user.orders.page(params[:page]).per(Comable::Config.orders_per_page)
|
9
9
|
end
|
10
10
|
|
11
11
|
def update_addresses
|
12
|
-
|
13
|
-
if
|
12
|
+
current_comable_user.attributes = user_params
|
13
|
+
if current_comable_user.save
|
14
14
|
flash.now[:notice] = Comable.t('successful')
|
15
15
|
else
|
16
16
|
flash.now[:alert] = Comable.t('failure')
|
@@ -18,8 +18,8 @@ module Comable
|
|
18
18
|
render :addresses
|
19
19
|
end
|
20
20
|
|
21
|
-
def
|
22
|
-
params.require(:
|
21
|
+
def user_params
|
22
|
+
params.require(:user).permit(
|
23
23
|
:bill_address_id,
|
24
24
|
:ship_address_id,
|
25
25
|
addresses_attributes: permitted_address_attributes
|
@@ -3,13 +3,13 @@
|
|
3
3
|
h1
|
4
4
|
= Comable.t('shopping_cart')
|
5
5
|
|
6
|
-
- if
|
6
|
+
- if current_comable_user.cart.errors.any?
|
7
7
|
.errors
|
8
8
|
ul
|
9
|
-
-
|
9
|
+
- current_comable_user.cart.errors.full_messages.each do |message|
|
10
10
|
li = message
|
11
11
|
|
12
|
-
- if
|
12
|
+
- if current_comable_user.cart.empty?
|
13
13
|
= Comable.t('carts.empty')
|
14
14
|
- else
|
15
15
|
table
|
@@ -23,7 +23,7 @@
|
|
23
23
|
th
|
24
24
|
|
25
25
|
tbody
|
26
|
-
-
|
26
|
+
- current_comable_user.cart.each do |cart_item|
|
27
27
|
- stock = cart_item.stock
|
28
28
|
- product = stock.product
|
29
29
|
tr
|
@@ -46,7 +46,7 @@
|
|
46
46
|
td
|
47
47
|
= link_to Comable.t('actions.destroy'), comable.cart_path(stock_id: stock.id), method: :delete
|
48
48
|
|
49
|
-
- if
|
49
|
+
- if current_comable_user.cart.any?
|
50
50
|
section.order.col-sm-4
|
51
51
|
table
|
52
52
|
thead
|
@@ -59,9 +59,9 @@
|
|
59
59
|
th.text-right
|
60
60
|
= Comable.t('item_total_price')
|
61
61
|
td
|
62
|
-
= number_to_currency
|
62
|
+
= number_to_currency current_comable_user.cart.price
|
63
63
|
tr.count
|
64
64
|
th.text-right
|
65
65
|
= Comable.t('item_total_quantity')
|
66
66
|
td
|
67
|
-
= number_with_delimiter
|
67
|
+
= number_with_delimiter current_comable_user.cart.count
|
@@ -16,42 +16,42 @@
|
|
16
16
|
= @order.class.human_attribute_name(:ship_address)
|
17
17
|
= render 'comable/shared/address', address: @order.ship_address
|
18
18
|
|
19
|
-
- if @order.
|
19
|
+
- if @order.payment
|
20
20
|
.col-sm-4.comable-payment_method
|
21
21
|
h2
|
22
22
|
= @order.class.human_attribute_name(:payment_method)
|
23
|
-
= @order.
|
23
|
+
= @order.payment.name
|
24
24
|
|
25
|
-
- if @order.
|
25
|
+
- if @order.shipment
|
26
26
|
.row
|
27
|
-
.col-sm-12.comable-
|
27
|
+
.col-sm-12.comable-shipment
|
28
28
|
h2
|
29
29
|
= @order.class.human_attribute_name(:shipment_method)
|
30
|
-
= @order.
|
30
|
+
= @order.shipment.name
|
31
31
|
|
32
32
|
.row
|
33
|
-
.col-sm-12.comable-
|
33
|
+
.col-sm-12.comable-order_items
|
34
34
|
table
|
35
35
|
thead
|
36
36
|
tr
|
37
37
|
th
|
38
38
|
th
|
39
|
-
= @order.
|
39
|
+
= @order.order_items.human_attribute_name(:price)
|
40
40
|
th
|
41
|
-
= @order.
|
41
|
+
= @order.order_items.human_attribute_name(:quantity)
|
42
42
|
|
43
43
|
tbody
|
44
|
-
- @order.
|
44
|
+
- @order.order_items.each do |order_item|
|
45
45
|
tr
|
46
46
|
td
|
47
47
|
.name
|
48
|
-
=
|
48
|
+
= order_item.name_with_sku
|
49
49
|
.caption
|
50
|
-
=
|
50
|
+
= order_item.product.caption
|
51
51
|
td.price
|
52
|
-
= number_to_currency
|
52
|
+
= number_to_currency order_item.price
|
53
53
|
td.quantity
|
54
|
-
= number_with_delimiter
|
54
|
+
= number_with_delimiter order_item.quantity
|
55
55
|
|
56
56
|
aside.col-sm-4
|
57
57
|
table
|
@@ -66,6 +66,11 @@
|
|
66
66
|
= @order.class.human_attribute_name(:item_total_price)
|
67
67
|
td
|
68
68
|
= number_to_currency @order.current_item_total_price
|
69
|
+
tr
|
70
|
+
th.text-right
|
71
|
+
= @order.class.human_attribute_name(:payment_fee)
|
72
|
+
td
|
73
|
+
= number_to_currency @order.current_payment_fee
|
69
74
|
tr
|
70
75
|
th.text-right
|
71
76
|
= @order.class.human_attribute_name(:shipment_fee)
|
@@ -15,12 +15,12 @@
|
|
15
15
|
= render 'comable/shared/address_form', address: ff
|
16
16
|
= f.submit Comable.t('next_step')
|
17
17
|
|
18
|
-
- if
|
18
|
+
- if current_comable_user.other_addresses.any?
|
19
19
|
.other_addresses.row
|
20
20
|
h2
|
21
21
|
= Comable.t('other_addresses')
|
22
22
|
ul.list-unstyled
|
23
|
-
-
|
23
|
+
- current_comable_user.addresses.each do |address|
|
24
24
|
- next if @order.ship_address.same_as? address
|
25
25
|
li.col-sm-4
|
26
26
|
= render 'comable/shared/address', address: address
|
@@ -24,12 +24,12 @@
|
|
24
24
|
|
25
25
|
= f.submit Comable.t('next_step')
|
26
26
|
|
27
|
-
- if
|
27
|
+
- if current_comable_user.other_addresses.any?
|
28
28
|
.other_addresses.row
|
29
29
|
h2
|
30
30
|
= Comable.t('other_addresses')
|
31
31
|
ul.list-unstyled
|
32
|
-
-
|
32
|
+
- current_comable_user.addresses.each do |address|
|
33
33
|
- next if @order.bill_address.same_as? address
|
34
34
|
li.col-sm-4
|
35
35
|
= render 'comable/shared/address', address: address
|
@@ -1,13 +1,15 @@
|
|
1
1
|
#comable-order
|
2
|
-
.comable-
|
2
|
+
.comable-payment
|
3
3
|
h1
|
4
4
|
= @order.class.human_state_name(:payment)
|
5
5
|
|
6
6
|
= form_for @order, as: :order, url: update_order_path, method: :put do |f|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
7
|
+
- payment = @order.payment || @order.build_payment
|
8
|
+
= f.fields_for :payment, payment do |ff|
|
9
|
+
ul
|
10
|
+
- Comable::PaymentMethod.all.each.with_index do |payment_method, index|
|
11
|
+
li
|
12
|
+
- checked_flag = payment.payment_method ? (payment.payment_method == payment_method) : index.zero?
|
13
|
+
= ff.radio_button :payment_method_id, payment_method.id, checked: checked_flag
|
14
|
+
= ff.label :payment_method_id, payment_method.name, value: payment_method.id
|
13
15
|
= f.submit Comable.t('next_step')
|
@@ -4,10 +4,12 @@
|
|
4
4
|
= @order.class.human_state_name(:shipment)
|
5
5
|
|
6
6
|
= form_for @order, as: :order, url: update_order_path, method: :put do |f|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
7
|
+
- shipment = @order.shipment || @order.build_shipment
|
8
|
+
= f.fields_for :shipment, shipment do |ff|
|
9
|
+
ul
|
10
|
+
- Comable::ShipmentMethod.activated.each.with_index do |shipment_method, index|
|
11
|
+
li
|
12
|
+
- checked_flag = shipment.shipment_method ? (shipment.shipment_method == shipment_method) : index.zero?
|
13
|
+
= ff.radio_button :shipment_method_id, shipment_method.id, checked: checked_flag
|
14
|
+
= ff.label :shipment_method_id, shipment_method.name, value: shipment_method.id
|
13
15
|
= f.submit Comable.t('next_step')
|
@@ -10,14 +10,14 @@ header
|
|
10
10
|
| descriptions
|
11
11
|
ul.nav.navbar-nav.navbar-right
|
12
12
|
li
|
13
|
-
= link_to Comable.t('my_account'), comable.
|
13
|
+
= link_to Comable.t('my_account'), comable.user_path
|
14
14
|
li
|
15
|
-
- if
|
16
|
-
= link_to comable.
|
15
|
+
- if current_comable_user.signed_in?
|
16
|
+
= link_to comable.destroy_user_session_path, method: :delete do
|
17
17
|
i.glyphicon.glyphicon-log-out>
|
18
18
|
= Comable.t('sign_out')
|
19
19
|
- else
|
20
|
-
= link_to comable.
|
20
|
+
= link_to comable.new_user_session_path do
|
21
21
|
i.glyphicon.glyphicon-log-in>
|
22
22
|
= Comable.t('sign_in')
|
23
23
|
.container
|
@@ -51,10 +51,10 @@ header
|
|
51
51
|
span
|
52
52
|
= Comable.t('cart')
|
53
53
|
span<
|
54
|
-
| (#{
|
54
|
+
| (#{current_comable_user.cart.size})
|
55
55
|
span.caret<
|
56
56
|
ul.dropdown-menu.comable-mini-cart role="menu"
|
57
|
-
-
|
57
|
+
- current_comable_user.cart.take(5).each do |cart_item|
|
58
58
|
li
|
59
59
|
= link_to comable.product_path(cart_item.product) do
|
60
60
|
.comable-image
|
@@ -1,14 +1,14 @@
|
|
1
1
|
= render 'comable/shared/address', address: address
|
2
2
|
|
3
3
|
ul.buttons.list-inline
|
4
|
-
- if address != address.
|
4
|
+
- if address != address.user.bill_address
|
5
5
|
li.use_bill_address
|
6
|
-
= form_for
|
6
|
+
= form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
|
7
7
|
= f.hidden_field :bill_address_id, value: address.id
|
8
8
|
= f.submit Comable.t('use_as_billing_address'), class: 'btn btn-default'
|
9
9
|
|
10
|
-
- if address != address.
|
10
|
+
- if address != address.user.ship_address
|
11
11
|
li.use_ship_address
|
12
|
-
= form_for
|
12
|
+
= form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
|
13
13
|
= f.hidden_field :ship_address_id, value: address.id
|
14
14
|
= f.submit Comable.t('use_as_shipping_address'), class: 'btn btn-default'
|
@@ -1,15 +1,15 @@
|
|
1
|
-
.
|
1
|
+
.user
|
2
2
|
.addresses
|
3
3
|
h1
|
4
4
|
= Comable.t('address_book')
|
5
5
|
|
6
|
-
- if
|
6
|
+
- if current_comable_user.errors.any?
|
7
7
|
.errors
|
8
8
|
ul
|
9
|
-
-
|
9
|
+
- current_comable_user.errors.full_messages.each do |full_message|
|
10
10
|
li = full_message
|
11
11
|
|
12
|
-
- if
|
12
|
+
- if current_comable_user.addresses.empty?
|
13
13
|
.not_found
|
14
14
|
p
|
15
15
|
= Comable.t('not_found')
|
@@ -17,9 +17,9 @@
|
|
17
17
|
.row
|
18
18
|
.bill_address.col-sm-6
|
19
19
|
h2
|
20
|
-
=
|
21
|
-
- if
|
22
|
-
= render 'address', address:
|
20
|
+
= current_comable_user.class.human_attribute_name(:bill_address)
|
21
|
+
- if current_comable_user.bill_address
|
22
|
+
= render 'address', address: current_comable_user.bill_address
|
23
23
|
- else
|
24
24
|
.not_found
|
25
25
|
p
|
@@ -27,9 +27,9 @@
|
|
27
27
|
|
28
28
|
.ship_address.col-sm-6
|
29
29
|
h2
|
30
|
-
=
|
31
|
-
- if
|
32
|
-
= render 'address', address:
|
30
|
+
= current_comable_user.class.human_attribute_name(:ship_address)
|
31
|
+
- if current_comable_user.ship_address
|
32
|
+
= render 'address', address: current_comable_user.ship_address
|
33
33
|
- else
|
34
34
|
.not_found
|
35
35
|
p
|
@@ -40,15 +40,15 @@
|
|
40
40
|
h2
|
41
41
|
= Comable.t('other_addresses')
|
42
42
|
ul.list-unstyled
|
43
|
-
-
|
43
|
+
- current_comable_user.other_addresses.each do |address|
|
44
44
|
li.col-sm-4
|
45
45
|
= render 'address', address: address
|
46
46
|
|
47
47
|
.new_address
|
48
48
|
h2
|
49
49
|
= Comable.t('new_address')
|
50
|
-
= form_for
|
51
|
-
= f.fields_for :addresses,
|
50
|
+
= form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
|
51
|
+
= f.fields_for :addresses, current_comable_user.addresses.build do |ff|
|
52
52
|
= render 'comable/shared/address_form', address: ff
|
53
53
|
.submit
|
54
54
|
= f.submit Comable.t('actions.create')
|
@@ -1,16 +1,16 @@
|
|
1
|
-
#comable-
|
1
|
+
#comable-user
|
2
2
|
h1
|
3
3
|
= Comable.t('my_account')
|
4
4
|
|
5
5
|
.comable-name
|
6
|
-
=
|
6
|
+
= current_comable_user.email
|
7
7
|
|
8
8
|
.comable-member-menu
|
9
9
|
ul
|
10
10
|
li
|
11
|
-
= link_to Comable.t('change_email_or_password'), comable.
|
11
|
+
= link_to Comable.t('change_email_or_password'), comable.edit_user_path
|
12
12
|
li
|
13
|
-
= link_to Comable.t('edit_your_address_book'), comable.
|
13
|
+
= link_to Comable.t('edit_your_address_book'), comable.addresses_user_path
|
14
14
|
|
15
15
|
.coamble-orders
|
16
16
|
h2
|
@@ -37,23 +37,23 @@
|
|
37
37
|
= order.bill_address.full_name
|
38
38
|
td
|
39
39
|
= order.code
|
40
|
-
- order.
|
40
|
+
- order.order_items.each do |order_item|
|
41
41
|
tr
|
42
42
|
td colspan="4"
|
43
43
|
.comable-detail
|
44
44
|
.row
|
45
45
|
.col-sm-2.comable-image
|
46
|
-
= link_to comable.product_path(
|
47
|
-
= image_tag
|
46
|
+
= link_to comable.product_path(order_item.product), class: 'thumbnail' do
|
47
|
+
= image_tag order_item.product.image_url, width: '100%'
|
48
48
|
.col-sm-10
|
49
49
|
.comable-name
|
50
|
-
= link_to
|
50
|
+
= link_to order_item.name_with_sku, comable.product_path(order_item.product)
|
51
51
|
.comable-repeat
|
52
52
|
= form_tag comable.add_cart_path do
|
53
|
-
- if
|
53
|
+
- if order_item.stock.stocked?
|
54
54
|
.add_cart.form-inline.form-group
|
55
|
-
= hidden_field_tag :stock_id,
|
56
|
-
= hidden_field_tag :quantity,
|
55
|
+
= hidden_field_tag :stock_id, order_item.stock_id
|
56
|
+
= hidden_field_tag :quantity, order_item.quantity
|
57
57
|
= submit_tag Comable.t('reorder'), class: 'btn btn-default'
|
58
58
|
|
59
59
|
.text-center
|
@@ -25,6 +25,8 @@ html
|
|
25
25
|
|
26
26
|
- mini_header_flag = controller_name == 'orders' || devise_controller?
|
27
27
|
body class="#{'comable-checkout-layout' if mini_header_flag}"
|
28
|
+
= render 'comable/shared/tracker'
|
29
|
+
|
28
30
|
- if mini_header_flag
|
29
31
|
= render 'comable/shared/header_for_checkout'
|
30
32
|
- else
|
data/config/routes.rb
CHANGED
@@ -20,9 +20,9 @@ Comable::Core::Engine.routes.draw do
|
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
-
devise_for :
|
23
|
+
devise_for :user, path: :member, class_name: Comable::User.name, module: :devise
|
24
24
|
|
25
|
-
resource :
|
25
|
+
resource :user, path: :member do
|
26
26
|
member do
|
27
27
|
get :addresses
|
28
28
|
put :addresses, action: :update_addresses
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comable_frontend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- YOSHIDA Hiroki
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-05-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: comable_core
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.4.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.4.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rails
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -211,16 +211,13 @@ files:
|
|
211
211
|
- app/assets/stylesheets/comable/products.scss
|
212
212
|
- app/controllers/comable/application_controller.rb
|
213
213
|
- app/controllers/comable/carts_controller.rb
|
214
|
-
- app/controllers/comable/customers_controller.rb
|
215
214
|
- app/controllers/comable/orders_controller.rb
|
216
215
|
- app/controllers/comable/products_controller.rb
|
216
|
+
- app/controllers/comable/users_controller.rb
|
217
217
|
- app/controllers/concerns/comable/payment_action.rb
|
218
218
|
- app/controllers/concerns/comable/shipment_action.rb
|
219
219
|
- app/controllers/concerns/comable/signin_action.rb
|
220
220
|
- app/views/comable/carts/show.slim
|
221
|
-
- app/views/comable/customers/_address.slim
|
222
|
-
- app/views/comable/customers/addresses.slim
|
223
|
-
- app/views/comable/customers/show.slim
|
224
221
|
- app/views/comable/orders/confirm.slim
|
225
222
|
- app/views/comable/orders/create.slim
|
226
223
|
- app/views/comable/orders/delivery.slim
|
@@ -235,6 +232,10 @@ files:
|
|
235
232
|
- app/views/comable/shared/_footer.slim
|
236
233
|
- app/views/comable/shared/_header.slim
|
237
234
|
- app/views/comable/shared/_header_for_checkout.slim
|
235
|
+
- app/views/comable/shared/_tracker.slim
|
236
|
+
- app/views/comable/users/_address.slim
|
237
|
+
- app/views/comable/users/addresses.slim
|
238
|
+
- app/views/comable/users/show.slim
|
238
239
|
- app/views/kaminari/comable_frontend/_gap.html.slim
|
239
240
|
- app/views/kaminari/comable_frontend/_next_page.html.slim
|
240
241
|
- app/views/kaminari/comable_frontend/_page.html.slim
|