raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-23 01:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 16 Branches 454 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

12401 Commits

Author SHA1 Message Date
summerscope
a711387794 Changing colors on SVGs to tweak for new primary red color 2014-07-18 17:15:35 +10:00
Will Marshall
92b7966941 Triggering dialog if page unsaved 2014-07-18 17:07:40 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00
summerscope
fe0956d3bb Update markup to make total price its own row on small devices 2014-07-18 16:36:14 +10:00
summerscope
63b0bb8122 Updating styling for product rows for small devices - total price gets its own row 2014-07-18 16:34:48 +10:00
summerscope
8d1175c495 Tweaks to input layout for responsive 2014-07-18 16:34:25 +10:00
Will Marshall
a480353158 Working bindings 2014-07-18 16:05:58 +10:00
summerscope
751865a540 More markup tweaks for responsive 2014-07-18 16:05:30 +10:00
summerscope
9e74bb8bf0 Pulling out css for refactoring, partials and further tweaks for responsive 2014-07-18 16:05:19 +10:00
summerscope
978b64547e Refactoring SASS for shopfront to add partials, break it out into logical clusters 2014-07-18 16:04:53 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
Rohan Mitchell
03273a76ad Merge branch 'fix_units' 2014-07-18 14:11:41 +10:00
Rohan Mitchell
7db2aff398 Generate variantUnitOptions - DRY 2014-07-18 14:10:42 +10:00
Will Marshall
a3d402ad53 Moving variants to a service, backreferencing and linking 2014-07-18 13:59:34 +10:00
summerscope
93aa3b5364 Tweak responsive on taxon icons 2014-07-18 12:54:28 +10:00
summerscope
fca552b254 Adjusting markup and adding classes to target elements as needed for responsive styling 2014-07-18 12:52:59 +10:00
summerscope
29058fa7cc Responsive styling and adjustments to cope with layout changes across devices 2014-07-18 12:50:22 +10:00
Rohan Mitchell
8484d19144 Convert variant_unit_options to a method, camelcase 2014-07-18 12:44:58 +10:00
Rohan Mitchell
04eca9591b Derive unitScales from unitNames 2014-07-18 12:39:16 +10:00
Rohan Mitchell
52b74bde91 Extract unit names from OptionValueNamer into VariantUnitManager 2014-07-18 12:39:16 +10:00
Rohan Mitchell
ed66633a93 Add comment 2014-07-18 12:39:16 +10:00
Rohan Mitchell
ab1628681e Call VariantUnitManager directly 2014-07-18 12:39:16 +10:00
Rohan Mitchell
8d5f953f78 Extract getScale from BOM controller to VariantUnitManager, extract specs as well 2014-07-18 12:39:16 +10:00
Rohan Mitchell
eafdf85c28 Extract class methods to new class VariantUnitManager 2014-07-18 12:39:11 +10:00
Will Marshall
a2da7f7ede Merge branch 'caching' into new_cart 
Conflicts:
	app/serializers/api/variant_serializer.rb
 2014-07-18 11:23:25 +10:00
Will Marshall
562f8dbd4e Starting to restructure data injection 2014-07-18 11:21:51 +10:00
Rohan Mitchell
6c59ffc16f Switch to class case for OptionValueNamer 2014-07-18 10:06:13 +10:00
summerscope
957c8cf89b Markup changes to all the partials for new shopfront page design 2014-07-17 17:24:54 +10:00
summerscope
7cb0e079ab Lots of changes for new shopfront design 2014-07-17 17:24:31 +10:00
summerscope
730373d677 Making all the images optimised - as wee as can be! 2014-07-17 17:24:14 +10:00
summerscope
1c3da6c003 Adding pretty design assets for new shopfront page 2014-07-17 17:23:45 +10:00
Rohan Mitchell
91e4f24fde Extract JS unit options into option value namer 2014-07-17 16:57:23 +10:00
Rohan Mitchell
989a14fa37 Change KL to kL, update specs for ML to kL change 2014-07-17 16:16:08 +10:00
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
Will Marshall
67922f38df Fixing some regressions to data submission 2014-07-17 14:46:46 +10:00
Will Marshall
541fe9ec37 Switching Checkout service to use CurrentOrder 2014-07-17 14:26:54 +10:00
Rohan Mitchell
b326ec8a3c Remove landing page images 2014-07-17 14:26:46 +10:00
Rohan Mitchell
19118da82e Remove old landing page cruft 2014-07-17 14:26:07 +10:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Rohan Mitchell
d7a5eb47f3 Store all images in a consistent path, compatible with development, and support S3 all round 2014-07-17 11:07:34 +10:00
Rohan Mitchell
c40c586b6f Store taxon icons in a path consistent with products 2014-07-17 10:23:07 +10:00
Will Marshall
2b1ab53d8e Fixing regressions and refactoring our tests 2014-07-16 16:00:44 +10:00
Will Marshall
cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition 2014-07-16 16:00:28 +10:00
Will Marshall
f4c1cd5253 Merge branch 'master' into caching 2014-07-16 11:47:07 +10:00
Rohan Mitchell
75a59eb5cc Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order. 2014-07-16 11:26:22 +10:00
Will Marshall
ea357b54ab Adding some map searching capabilities 2014-07-16 11:19:16 +10:00
Rohan Mitchell
42b951c972 Variants controller #search filters by distribution 2014-07-16 10:31:12 +10:00
Rohan Mitchell
b7a08bcb9b Add Spree::Variant.in_order_cycle 2014-07-16 09:33:59 +10:00