raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 18 Branches 453 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

60 Commits

Author SHA1 Message Date
Rohan Mitchell
02d68c662b Add titles to all darkswarm pages 2015-06-16 15:31:35 +10:00
Rohan Mitchell
610a4c03fe Merge branch 'master' into redesign 
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
 2015-06-10 18:27:50 +10:00
Maikel Linke
503b687ed1 Display distributor banner only if current_distributor is present 2015-05-29 15:19:05 +10:00
summerscope
1090328a3c Adding padding class and apply to templates to have required padding for new footer. 2015-05-02 20:12:33 +10:00
Rohan Mitchell
08fef890ec Do not show tax lines if there is no tax on the order 2015-04-17 13:41:14 +10:00
Rohan Mitchell
77d7255243 Use short syntax for rendering partials 2015-04-17 13:39:10 +10:00
Rohan Mitchell
beec910445 Display tax in cart 2015-04-17 13:39:09 +10:00
Rob Harrington
226e2f0e2c Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor 2015-04-10 09:26:20 +10:00
Rob Harrington
dd8c769ea9 Hiding fee breakdown on cart page for now 2015-03-13 16:50:57 +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
c3c1573f54 Adding a comment 2015-03-05 23:22:31 +11:00
summerscope
e3b660abb9 Shopping cart page update to simplify, improve and expose fees 2015-03-05 17:21:13 +11:00
summerscope
5b6bff1691 Removing bad nasty overrides which are confusing and bad. and nasty. 2015-03-04 17:20:05 +11:00
summerscope
76f234ee4d Order confirmation top page working on header label 2015-03-04 17:18:55 +11:00
Rohan Mitchell
94684e9963 Show overridden price in shopping cart 2014-12-19 16:51:11 +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
8f27c643f1 Move override for cart line item into existing view replacement 2014-11-26 16:08:53 +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
Rohan Mitchell
e28e86a82c Remove link from cart to old product page 2014-08-07 16:46:57 +10:00
summerscope
6515f0f096 Tweak labels to make page heading more consistent, give useful names to SHopping cart and Checkout pages 2014-08-06 13:34:06 +10:00
summerscope
d48b317d3b Checkout page header update 2014-08-06 13:25:06 +10:00
Will Marshall
b1f275dac8 Adding enterprises to cart to prevent errors being thrown 2014-06-25 14:38:16 +10:00
Will Marshall
b3f0cb1e74 Bunch of minor bugfixes 2014-06-24 17:14:01 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
Will Marshall
8bb5f75ea0 Temporary fix to get staging working 2014-06-20 13:51:21 +10:00
summerscope
00ac80bdbb Add new icons 2014-05-30 12:56:56 +10:00
summerscope
a54b3f7849 Adding new icon for refresh 2014-05-30 12:39:44 +10:00
summerscope
9a962f7445 Add new icons to checkout & back to cart buttons 2014-05-30 12:35:54 +10:00
summerscope
d874855aa1 Update styling on empty cart 2014-05-20 16:40:23 +10:00
Will Marshall
ef91f8d17f Redirecting if cart is empty and activating the empty cart link 2014-05-20 16:05:28 +10:00
summerscope
0957edee5d Styling for shopping cart page 2014-05-20 15:50:03 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
403ad797ac Tidying up the cart 2014-04-01 12:42:42 +11:00
Will Marshall
e51f1b508d Fixing the empty cart button 2014-04-01 12:39:47 +11:00
Will Marshall
6e5c93526c Moving everything to a single Angular application 2014-03-20 16:58:57 +11:00
Will Marshall
01503632f2 Changing cart titles 2014-03-19 10:52:26 +11:00
Will Marshall
9c26d23cb5 Greying the buttons like a boss 2014-03-19 10:48:49 +11:00
Will Marshall
a8547a9e64 Adjustments toggling 2014-03-19 10:45:40 +11:00
Will Marshall
d5b1cc3303 Swapping buttons 2014-03-19 10:40:30 +11:00
Will Marshall
96ce982ea3 Reworking the checkout into Darkswarm, patching up tests 2014-03-18 15:58:22 +11:00
Will Marshall
ac78ab91fe Fixing up some regression issues 2014-03-14 16:54:43 +11:00
Will Marshall
a954f2c21a Basic Darkswarm version of the Order Confirmation page 2014-03-14 16:11:40 +11:00
Rohan Mitchell
30bc45370b When order cycle expires mid-order, clear the order cycle and display a message 2013-09-30 16:56:11 +10:00
Rohan Mitchell
60956e9789 Display sum of distribution fees at cart by adjustment, not shipping methods 2013-08-13 09:11:25 +10:00
Rohan Mitchell
b7ea03f7fc Remove distributor fees table at checkout, pending design of new breakdown 2013-08-13 09:11:25 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
Rob H
612017f143 WIP Upgrade to Spree 1.3 2013-02-05 15:01:45 +11:00
Rob H
f7890bd94d Fixes following code review for checkout changes 2013-01-18 19:17:55 +11:00
Rob H
63cf128f86 Remove product descriptions from line item listings in cart and order 2012-12-14 15:08:35 +11:00