raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,268 Commits 18 Branches 452 Tags
6586e67a5c4eec459557c19f64bc45e3de75bc8c
Commit Graph

344 Commits

Author SHA1 Message Date
Rob Harrington
7028fbe288 Find current_customer via current_distributor and current_user rather than current_order 
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
 2016-05-28 00:31:59 +10:00
Rob Harrington
6dd05ca4da Intermittent fail hunting 2016-05-27 16:25:10 +10:00
Rob Harrington
607b674c57 Refactoring tag rule logic, placing in TagRuleApplicator lib class 2016-05-27 16:25:10 +10:00
Rob Harrington
3fb6fba0f0 Adding payment method tag rule logic to Spree::Order.available_payment_methods 2016-05-27 16:25:10 +10:00
Maikel Linke
a624a57bfb Pass current order to PaymentMethodSerializer 2016-05-25 17:12:47 +10:00
Maikel Linke
16b80a2f1b Extend PaymentMethod with calculated_adjustments 2016-05-25 14:56:52 +10:00
Continuous Integration
f90e7d3239 Merge remote-tracking branch 'origin/master' into HEAD 2016-05-06 13:58:37 +10:00
Rohan Mitchell
8f8a1191cb Remove stock cap on max_quantity 2016-04-27 12:27:24 +10:00
Steve Pettitt
ad6037ac63 Fix user spec, check config is set 2016-04-26 04:21:50 +01:00
Steve Pettitt
53d50f16d6 Merge current master 2016-04-26 03:18:27 +01:00
Maikel Linke
2367b73d3a Revert "Associate new users with existing customer records" 
This reverts commit a25f4fdf44.

Since email addresses are not validated, these associations would allow
an attacker to signup with the email address of another person and view
their orders.
 2016-04-22 14:55:43 +10:00
Rohan Mitchell
5151779f80 When update is for another line item, still update all stock levels and show warnings 2016-04-21 09:36:23 +10:00
Rohan Mitchell
b2d78e7df6 Set allow_backorders explicitly for consistency in CI 2016-04-21 09:36:23 +10:00
Rohan Mitchell
8695dea0a5 Remove variant from cart when it becomes out of stock 2016-04-21 09:36:23 +10:00
Rohan Mitchell
792e17c385 When removing variant from order, if not found then do nothing 2016-04-21 09:36:23 +10:00
Rohan Mitchell
292d027498 When adding an item to cart with not enough stock, add as much as we can without erroring 2016-04-21 09:36:22 +10:00
Steve Pettitt
0b820361de Merge master 2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3 Add failed payments, update spec 2016-04-15 08:26:12 +01:00
Maikel Linke
a25f4fdf44 Associate new users with existing customer records 2016-04-15 11:57:18 +10:00
Rob Harrington
0ed97d820c Removing unrequired Spree::Order#with_payment_method_name scope 2016-04-02 01:04:09 +11:00
Rob Harrington
f902474591 Relevant DiscountOrder tag rules are applied to orders on update 2016-04-01 19:48:25 +11:00
Maikel
ca0c677d46 Auto-merged master into uk/account-balances on deployment. 2016-03-19 07:16:41 +11:00
Steve Pettitt
276d3026c8 Adding specs for orders by ditributor query 2016-03-18 20:05:52 +00:00
Rohan Mitchell
6f29a8b642 Refresh cache when inventory setting product_selection_from_inventory_only is changed 2016-03-09 13:29:33 +11:00
Rohan Mitchell
780ec598d6 Use preferred_currency instead of preferences[:currency]. Use constant for currency instead of config var. 
Conflicts:
	spec/models/spree/shipping_method_spec.rb
 2016-03-04 11:53:32 +11:00
Rohan Mitchell
1440544b2d Use persisted models 2016-03-04 11:41:49 +11:00
Rohan Mitchell
bc2223fb8e Fix intermittent spec fails: currency inconsistencies on CI and retry on VOs 2016-03-04 10:15:57 +11:00
Rohan Mitchell
422061f137 Merge branch 'master' into products-caching 
Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb
 2016-03-03 09:42:52 +11:00
Rob Harrington
1d83809866 Bugfix: Spree::Variant#not_hidden_for scope was broken 
Was getting confused by presence of inventory items for other enterprises when none existed for a given variant/enterprise combo
 2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642 OC Coordinators can opt to restrict products in an order cycle to those in their inventory only 2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb Adding global config to allow shop users to only select from inventory variants in OC interface 2016-03-02 12:10:22 +11:00
Rob Harrington
59745fbc73 EnterpriseFees can inherit tax_category from product 2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671 Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false 2016-03-02 11:56:46 +11:00
Rohan Mitchell
45a7b13e9a Refresh cache when option type destroyed 2016-02-26 10:09:16 +11:00
Rohan Mitchell
8928e461d4 Refresh cache when option type changed 2016-02-26 09:59:16 +11:00
Rohan Mitchell
b5204a4820 Refresh cache when option value changed or destroyed 2016-02-25 11:08:53 +11:00
Rohan Mitchell
62c6530ca9 Do not refresh products cache when price destroyed - variant destruction is main (only?) trigger, it causes refresh 2016-02-24 15:05:03 +11:00
Rohan Mitchell
f78826c9c7 Fix rare case where price is saved without variant 2016-02-24 15:05:03 +11:00
Rohan Mitchell
339f3fc2f0 Refresh products cache when price is changed or destroyed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
d8d803546b Refresh products cache when master variants or images are changed or destroyed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
6d80d91873 Refresh products cache when taxons or classifications are changed or destroyed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
7c4e9e5838 Refresh products cache when product properties are changed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
0c0c98a0b0 Refresh products cache on product change 2016-02-24 15:05:01 +11:00
Rohan Mitchell
eba636c929 When variant is changed/destroyed, trigger product cache refresh 2016-02-24 15:05:01 +11:00
Rob Harrington
94785d4157 Fixing authorization for VariantOverridesController#bulk_reset 2016-01-15 09:07:49 +11:00
Rohan Mitchell
257b5a9eef Move premature Spree::Order#update prevention up a level, for even greater efficiency gains 2016-01-07 12:09:57 +11:00
Rohan Mitchell
e24027a8d0 Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee 2016-01-07 10:52:36 +11:00
Rob Harrington
fe0652e243 When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value 2015-12-16 19:18:59 +11:00
Rob Harrington
befc558224 Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name 
Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items
 2015-12-16 11:55:24 +11:00
Maikel Linke
cd7721a127 Using date and time of current timezone 
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
 2015-12-10 11:38:41 +11:00