raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,712 Commits 17 Branches 454 Tags
19e31a264d8da2ee2e3b6080caedae2d6d8157c8
Commit Graph

351 Commits

Author SHA1 Message Date
Will Marshall
19e31a264d Tidying footer contact details 2014-02-14 15:49:16 +11:00
Will Marshall
502dba1b3f Fixing bug #281 2014-02-14 15:35:40 +11:00
Rohan Mitchell
701896be95 BPE: Add variant and save it to server. Edit the saved variant. 2014-02-13 11:52:44 +11:00
Rohan Mitchell
4d24fec6fb BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants. 2014-02-13 09:26:07 +11:00
Rohan Mitchell
4aa43cfbe0 Set the master unit value for a product without variants 2014-02-12 13:57:49 +11:00
Rohan Mitchell
b2ad6c7d57 Filter products for submit includes master variant 2014-02-11 19:23:27 +11:00
Rohan Mitchell
e845c0dc06 Remove derived attributes from master variant 2014-02-11 19:20:46 +11:00
Rohan Mitchell
0b255ed1e9 Pack the master variant before sending to the server 2014-02-11 19:19:12 +11:00
Rohan Mitchell
c7c70252d0 ofnTrackProduct and ofnTrackVariant accept nested properties as arguments 2014-02-11 19:13:11 +11:00
Will Marshall
b1118735ec One CSS change, adding a test for le price adjustments 2014-02-07 11:09:47 +11:00
Rohan Mitchell
33691085bd Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity. 2014-02-06 13:51:08 +11:00
Will Marshall
a1f75aa55e Fixing up the top menu a bit 2014-02-06 13:49:27 +11:00
Will Marshall
ed8727708d Improving responsiveness, hopefully 2014-02-06 13:03:40 +11:00
Will Marshall
910d8e033e Increasing space on right of product images 2014-02-05 15:10:45 +11:00
Will Marshall
a3e6a6253c Reworking table cell widths 2014-02-05 14:31:06 +11:00
Will Marshall
35c74e2bf0 Reworking shop to be more responsive 2014-02-05 14:26:41 +11:00
Will Marshall
5eff05d466 Removing the footer cruft 2014-02-04 14:50:18 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00
Rob H
58d1bf0092 BOM: can update quantities of line_items 2014-01-31 11:57:57 +08:00
Rob H
0ac1816eb8 BOM: Add css to to allow visualisation of update status 2014-01-31 11:40:28 +08:00
Rob H
d679c7ac30 BOM dataSubmitter service changes class of relevant element based on response 2014-01-31 11:38:38 +08:00
Rob H
7dbb7a5c2c BOM: applying ofnLineItemUpdAttr directive to quantity field, tracks changes with update-pending class 2014-01-31 11:17:27 +08:00
Rob H
67db698a50 BOM: Add ofnLineItemUpdAttr directive to watch for changes in line_item attributes 2014-01-30 18:40:23 +08:00
Rob H
4fb06b76c7 BOM: Add switchClass service to help visualise update status 2014-01-30 18:34:48 +08:00
Rob H
b8448853ac BOM: Add dataSubmitter service to handle updates 2014-01-30 17:09:55 +08:00
Rob H
224d91083d BOM: Add factory to monitor changes made to line_items 2014-01-30 14:12:28 +08:00
Will Marshall
803f653d39 Cleaning up handling of the page when no order cycle is selected 2014-01-22 14:25:41 +11:00
Will Marshall
7737a5da1d Patching some regressed tests, getting in some responsive layout 2014-01-22 13:38:07 +11:00
Will Marshall
309f7d868d Tweaking ze CSS for pretty 2014-01-22 11:58:37 +11:00
Will Marshall
60bf431008 Stripping HTML from description, since we seem to occasionally get some 2014-01-22 11:55:57 +11:00
Will Marshall
17c6321c8b Adding some basic collapse/expand for variants in Shop 2014-01-22 11:55:57 +11:00
Will Marshall
8879181a27 Adding promo image to about panel 2014-01-21 16:56:00 +11:00
Rob H
90f88d260b Confirm deletion of line items on BOM 2014-01-19 21:59:07 +08:00
Rob H
b9a3031663 Line item delete button works 2014-01-19 21:46:11 +08:00
Rob H
701b5aceb4 Add 'All' option to supplier and distributor filters 2014-01-18 14:26:07 +08:00
Rob H
79631ebb8e Add distributor filter to BOM 2014-01-18 12:48:52 +08:00
Rob H
680b5c8a42 Add supplier filter to BOM 2014-01-18 11:13:32 +08:00
Rob H
d6b4f8129c Match supplier of each line item with the list fetched from server 2014-01-17 17:14:05 +08:00
Rob H
94c375ad31 WIP: changing BOM listing from orders to line items 2014-01-17 16:57:08 +08:00
Will Marshall
48854fdcf5 Adding date parsing to Angular 2014-01-17 17:13:15 +11:00
Rob H
5aa032b54c BOM: fetchOrders sends request to API and resetOrders stores returned data 2014-01-17 14:00:02 +08:00
Rob H
c6d9bfafbc Create shared services module for backend angularjs, rename modules 2014-01-17 13:48:28 +08:00
Rob H
970942ff42 Add JS spec and basic initialisation code for BOM 2014-01-17 13:16:35 +08:00
Rohan Mitchell
87cf596a30 For a product with one or more on_demand variants, don't show 'On demand' at the product level 2014-01-17 16:12:07 +11:00
Rohan Mitchell
ed78cc053b Do not update product on_hand when product has on_demand variants 2014-01-17 16:12:07 +11:00
Will Marshall
6f5ff0ab2c Making a light grey option 2014-01-16 16:49:50 +11:00
Rohan Mitchell
d861495d7d Fix incomplete save when first setting variant_unit 2014-01-16 14:20:26 +11:00
Rob H
ce5b24a777 Prevent duplicate filters being added 2014-01-15 15:50:41 +08:00
Rob H
8146301b2f Add validation to BPE advanced filter box 2014-01-15 14:35:46 +08:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00