luisramos0
86accc227e
Convert erb files brought from spree_auth_devise to haml
2019-07-08 18:09:03 +01:00
luisramos0
9669016573
Add required views from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
a0c56f31c7
Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code
2019-05-21 12:39:29 +02:00
luisramos0
60ee17204b
Merge branch 'master' into 2-0-stable-Mar16
2019-03-16 16:17:38 +00:00
luisramos0
93e13742be
Delete some more dead overrides. We are not using spree/checkout (except for /checkout/payment) nor spree/products
2019-03-01 23:56:03 +00:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Pau Perez
1f2820f6d4
Add #delivery? in ShippingMethod
2017-08-11 14:41:02 +10:00
Rob Harrington
6c90b4e6d0
Adding alert to order summary, notifying user of remaining time to make changes
2017-05-05 14:20:57 +10:00
Rob Harrington
e79a23a554
Disabling save button on order page until changes are made to the order
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Rob Harrington
768240a5ba
Reorganising darkswarm order views into partials
2017-05-05 14:19:32 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Maikel Linke
f68f7ea2b6
Fix display of "Total"
2016-01-15 12:07:43 +11:00
Christian
839bf8794f
Fix a hard cocded string on Order summary screen
...
Created an order_pickup_time entry in locale files.
2016-01-07 07:06:26 +01:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +11:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
e843beaf18
Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636
2015-08-07 14:19:48 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
summerscope
d2fbf9f14d
Fixing logic for instance where collection instructions are not entered
2015-03-13 18:00:36 +11:00
Rob Harrington
44511b8b61
Only display shipping description if it exists
2015-03-12 16:18:30 +11:00
summerscope
f698408d40
Logic for delivery vs collection - making template
2015-03-10 14:58:58 +11:00
summerscope
21b18a8cc5
WIP commit so i can see what i messed up.
2015-03-10 12:31:53 +11:00
summerscope
91bf588bcc
Order details page add in mini thumbnail for product image
2015-03-10 12:03:21 +11:00
summerscope
a8de4dc039
WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.
2015-03-10 11:35:53 +11:00
summerscope
a0af22350d
Order conf page WIP
2015-03-05 17:21:25 +11:00
summerscope
574a215525
Order Confirmation Page WIP
2015-03-05 11:26:29 +11:00
summerscope
47b08269d6
Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.
2015-03-04 17:19:24 +11:00
Rob Harrington
8a3bffb37d
Cart page conforms to convention in rest of checkout, adjusting helpers through checkout
2014-11-26 18:53:29 +11:00
Rob Harrington
f6b0863279
Make cost breakdowns consistent throughout checkout
2014-11-26 13:07:40 +11:00
Rafael Schouten
09a4c4e17e
add spree currency helper, fix some typos and specs
2014-09-11 11:47:55 +10:00
Rafael Schouten
991d0029dd
add currency localisation
2014-09-08 00:06:53 +10:00
Will Marshall
65d11ce552
Removing some unnecessary
2014-05-29 15:41:27 +10:00
Will Marshall
c6f1d43dbd
Reworking the shipping confirmation
2014-03-19 16:09:45 +11:00
Will Marshall
a954f2c21a
Basic Darkswarm version of the Order Confirmation page
2014-03-14 16:11:40 +11:00
Will Marshall
713742f016
Adding back in an important ID
2013-11-08 17:16:45 +11:00
Will Marshall
59b6badcd6
Small text change on the order confirmation screen
2013-11-06 13:28:54 +11:00
Rohan Mitchell
89f93cae77
Rename namespaced includes from open_food_web to open_food_network
2013-10-18 17:43:18 +11:00
Rohan Mitchell
57f7d489ff
Rename OpenFoodWeb namespace to OpenFoodNetwork
2013-10-18 17:29:55 +11:00
alexs
8b4c0682fb
Replaced eaterprises logo with the distributor name header.
2013-08-21 16:05:06 +10:00
Andrew Spinks
bc57364c7e
Add simple angular cart to the main page.
2013-08-08 18:31:56 +10:00
Andrew Spinks
d107786614
Make sure the payment details are shown prominently in the checkout screen.
2013-07-29 16:29:27 +10:00
Andrew Spinks
5adab948c9
Re-instate old order checkout behaviour.
2013-07-26 14:30:54 +10:00
Andrew Spinks
7cb054f430
Merge branch 'master' into order-cycle-selection
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6
Merge branch 'local-organics'
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
2013-07-23 11:40:03 +10:00
Rob H
8f6ec9bd9b
WIP (Spree Update): Fix frontend order payment summary
2013-07-23 10:43:08 +10:00
Rohan Mitchell
6ceb8e9ee7
Restore change: render checkout distributor details from partial
2013-07-22 11:23:48 +10:00
Rohan Mitchell
568837aa53
Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME"
...
This reverts commit b7f7766893
2013-07-22 11:22:20 +10:00
