raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 20 Branches 451 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

55 Commits

Author SHA1 Message Date
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
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
Rohan Mitchell
b7f7766893 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 2013-05-18 19:54:27 +10:00
Rohan Mitchell
ad32147576 Display correct product splitting criteria 2013-04-05 14:30:35 +11:00
Rohan Mitchell
f8ebb0c715 Rename split partial and update overrides 2013-04-05 11:34:03 +11:00
Rohan Mitchell
8b5aea42b8 Add deface for order cycle selection 2013-03-08 15:15:15 +11:00
Rob H
2cdf458d6a Move additional of tabs to main nav bar to defaces, rather than overriding view directly 2013-02-14 15:42:47 +11:00
Rob H
99b4530db2 WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name 2013-02-07 13:07:14 +11:00
Rob H
ee482d520c Replace order information display for Confirm and Complete stages of checkout 2012-11-23 10:51:14 +11:00
Rob H
3d025bb709 WIP Replace order information display for Confirm and Complete stages of checkout 2012-11-23 09:26:27 +11:00
Rohan Mitchell
927970d1a9 Viewing another products listing page does not display home page content 2012-10-12 09:39:49 +11:00
Rohan Mitchell
3dd3d8030f Display CMS pages in menu 2012-10-11 17:00:34 +11:00
Rohan Mitchell
cab61ddb7c CMS content on home page 2012-10-11 16:21:33 +11:00
Rohan Mitchell
af05448dd8 For check payment method, display description after purchase for use with EFT 2012-06-29 15:27:30 +10:00
Rohan Mitchell
e0e566e625 Display distributor information on checkout address page 2012-06-26 16:04:59 +10:00
Rohan Mitchell
0662e8f676 Show links to distributor home page, particularly when viewing product not available at current distributor 2012-06-26 08:12:35 +10:00
Rohan Mitchell
6cd9bff29f Convert most templates from erb to haml 2012-06-25 09:06:56 +10:00
Rohan Mitchell
9be5dc41b9 Split products by local/remote distributor: style 2012-06-24 09:41:33 +10:00
Rohan Mitchell
34f95ffb4a Split products by local/remote distributor: apply to products, search results and taxon pages 2012-06-24 09:21:44 +10:00
Rohan Mitchell
32050bbba4 Split products by local/remote distributor: views and basic style 2012-06-24 07:37:25 +10:00
Rohan Mitchell
0c5162f9fb Move distributor lookup code into current_distributor helper 2012-06-22 11:48:39 +10:00