raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 18 Branches 451 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

452 Commits

Author SHA1 Message Date
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
Will Marshall
871637c4af NO CAN HAZ EMPTY CART PAGE 2014-02-12 12:31:37 +11:00
Will Marshall
b11533a629 Renaming ShopController to Shop::ShopController 2014-02-07 16:52:18 +11:00
Will Marshall
7af1d72ef9 Working login and signup forms for checkout, specs, redirect back to checkout on success 2014-02-07 16:07:18 +11:00
Rob H
17456ebf2e BOM: only fetch completed orders 2014-02-07 15:29:31 +11:00
Will Marshall
63f85fef0e Starting to get in the login stuff 2014-02-07 14:34:49 +11:00
Will Marshall
cec0ad8a83 Adding ze boilerplate 2014-02-07 13:55:25 +11:00
Will Marshall
b1118735ec One CSS change, adding a test for le price adjustments 2014-02-07 11:09:47 +11:00
Will Marshall
2bb004ebaa Adding notes field to products 2014-02-04 14:11:32 +11:00
Will Marshall
934f1eb196 Re-arranging product page into partials, redoing price display 2014-02-04 11:24:27 +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
3beb633ed9 BOM: 'update-pending' class removed when value is init value 2014-01-31 11:24:14 +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
a5ffdbb1ba Display quantity in field for BOM 2014-01-31 10:48:28 +08:00
Rob H
3bf36f0e55 Fix orders specs which fail because of new admin orders submenu 2014-01-30 14:06:32 +08:00
Will Marshall
c270473c93 Patching up the shopping spec 2014-01-22 14:36:31 +11: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
17c6321c8b Adding some basic collapse/expand for variants in Shop 2014-01-22 11:55:57 +11:00
Rohan Mitchell
6d2f77b308 Fix report spec 2014-01-22 10:16:45 +11:00
Will Marshall
8879181a27 Adding promo image to about panel 2014-01-21 16:56:00 +11:00
Will Marshall
aec5894c70 Adding a promo image to enterprises 2014-01-21 16:32:55 +11:00
Will Marshall
8cc18e8db4 Fixing the shopping spec to conform to the new format of dates 2014-01-21 15:42:11 +11:00
Rob H
b9a3031663 Line item delete button works 2014-01-19 21:46:11 +08:00
Rob H
02f8917722 Add delete button to BOM page 2014-01-18 21:00:54 +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
6c1d149397 Add columns for quantity and max to BOM 2014-01-17 18:26:30 +08:00
Rob H
0e861d98af Add column for variant description to BOM 2014-01-17 17:32:29 +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
Rob H
e0d03fa305 Listing more attributes of orders on BOM page 2014-01-17 15:29:08 +08:00
Rob H
00dfa62f43 Basic listing of orders on BOM page 2014-01-17 14:56:26 +08:00
Will Marshall
1e88c0a6f1 Adding max quantity for group buy to ze form 2014-01-17 16:32:32 +11: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
Rohan Mitchell
4518e30849 Display infinite on_hand as read-only 2014-01-17 16:12:07 +11:00
Will Marshall
b6590000a4 Improving Product's has_stock, filtering Shop#products to in_stock products 2014-01-17 14:41:15 +11:00
Will Marshall
b6d796e3bc Getting in ze test for previous commit 2014-01-16 16:25:41 +11:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Will Marshall
cbce5958e0 Removing an attr_accessible which breaks EVERYTHING 2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rohan Mitchell
d861495d7d Fix incomplete save when first setting variant_unit 2014-01-16 14:20:26 +11:00
Will Marshall
35cc113aca Fixing the checkout spec to conform to reply_to instead of from on mailer 2014-01-16 13:04:26 +11: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
Rohan Mitchell
68e5de0290 Update acceptance specs to expect unit values to be stored in base units 2014-01-14 15:14:54 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00