raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,663 Commits 19 Branches 452 Tags
a5debc19dce91abeaebcd7de4bc74f119124b4a1
Commit Graph

115 Commits

Author SHA1 Message Date
Rohan Mitchell
3524e658f8 Error when creating product and master is invalid, instead of creating a product without a master 2014-08-25 11:52:15 +10:00
Rohan Mitchell
50e4c5fac9 Users with only a profile-level enterprise see only menu items for enterprise management 2014-08-19 14:26:45 +10:00
Rob H
044a4c6816 Finish changing class names for PayPal gateways 2014-08-08 23:19:13 +10:00
Rob H
51f912033b Remove test for PayPalExpress UK which does not exist anymore 2014-08-08 22:39:26 +10:00
Rob H
40d290951c Fix failing specs related to requiring distributor for payment method 2014-08-08 17:47:51 +10:00
Rob H
16215289d0 Spec for payment method clean_name translation 2014-08-08 17:47:50 +10:00
Rob H
f021d260b1 Require payment_methods to be associated with at least one hub 2014-08-08 17:47:50 +10:00
Rohan Mitchell
8c41a6c909 Calculate fee breakdown 2014-07-31 11:36:53 +10:00
Rohan Mitchell
45fd479ade WIP: Call create_order_adjustments_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
8fe355b6da WIP: Call create_line_item_adjustments_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
b40b6f9faf WIP: Call fees_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +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
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
Rohan Mitchell
b7a08bcb9b Add Spree::Variant.in_order_cycle 2014-07-16 09:33:59 +10:00
Rohan Mitchell
0ecfee79d4 Add Spree::Variant.in_distributor 2014-07-16 09:33:59 +10:00
Rob H
fa337fcd6e Prevent display_as and display_name from being used when blank 2014-07-10 17:04:35 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Rohan Mitchell
92e3546a76 Retrieve properties for a product as a hash 2014-06-18 15:22:03 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rohan Mitchell
836a08606c Product and variant deletion removes the product or variant from any order cycles 2014-06-12 14:59:27 +10:00
Rohan Mitchell
083220089f WIP: Delete ExchangeVariants when product is soft-deleted 2014-06-12 14:59:27 +10:00
Rohan Mitchell
e6c7acdff3 Add soft-delete method to variant 2014-06-12 14:59:26 +10:00
Rob H
9f681bd1ef Use display_as as option value for variant when it is present 2014-06-12 12:57:56 +10:00
Rob H
1a91b5a728 Move option value naming logic into separate lib class 2014-06-12 12:55:53 +10:00
Rob H
c09aeeee8f Recalculate option values on variants when product variant unit is changed 2014-06-12 12:11:20 +10:00
Rob H
2c78d537fa Use display_as as option value for variant when it is present 2014-06-12 11:49:52 +10:00
Rob H
e9f2a8f2cd Move option value naming logic into separate lib class 2014-06-12 11:49:52 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Will Marshall
4d7fa8b1bf Removing payments when emptying order 2014-06-10 11:15:04 +10:00
Will Marshall
37f197205f Removing shipping method from order when emptied 2014-06-06 16:39:53 +10:00
Rohan Mitchell
1d44cbf506 Show distribution charge on report 2014-06-06 09:47:16 +10:00
Rohan Mitchell
f8fa014796 LineItem.supplied_by_any 2014-06-06 09:47:15 +10:00
Rob H
3240a4e08e Use display_as as option value for variant when it is present 2014-06-04 17:23:11 +10:00
Rob H
8d87cfbc35 Move option value naming logic into separate lib class 2014-06-04 14:54:42 +10:00
Rob H
bcfa1a8266 Fix spec to check validation of missing primary_taxon correctly 2014-05-30 20:06:40 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
Rohan Mitchell
e951f80070 Merge branch 'new-product-form' 
Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
 2014-05-24 17:14:32 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Will Marshall
17f09d1852 Adding primary taxon field to product 2014-05-24 09:29:19 +10:00
Rohan Mitchell
ad1f852bdd Revert "Adding primary taxon field to product" 
This reverts commit fd1e7ebaa3.
 2014-05-24 09:07:57 +10:00
Will Marshall
fd1e7ebaa3 Adding primary taxon field to product 2014-05-23 15:59:06 +10:00
Rob H
ed3c23cd90 Split 'My Enterprises' dashboard item into Hubs and Producers 2014-05-22 15:28:25 +10:00
Rohan Mitchell
f6bc1a82be Enterprise user can manage enterprise relationships 2014-05-22 10:54:51 +10:00
Will Marshall
9f169e6ef8 Adding a basic stub of the primary taxon 2014-05-16 10:23:31 +10:00
Rohan Mitchell
3c8757034a Enterprise user can soft-delete a variant. BUT, only its own variants. 2014-04-24 13:20:16 +10:00
Rohan Mitchell
4cbe434573 Remove trailing relations on destruction for EnterpriseFee and Variant 2014-04-24 13:20:15 +10:00
Rob H
20a5278a75 Merge branch 'master' into bom 2014-04-17 09:23:08 +10:00
Rob H
2b283405e7 Only admin and users of distributors can access admin orders 2014-04-13 10:09:17 +10:00