raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,987 Commits 17 Branches 453 Tags
a5a2cb8ea7d494f73f0262fdade770ade3149234
Commit Graph

983 Commits

Author SHA1 Message Date
Pau Perez
a5a2cb8ea7 Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up" 
This reverts commit fa689b6607, reversing
changes made to 2aeed9763c.
 2018-10-15 15:48:48 +02:00
Pau Pérez Fabregat
fa689b6607 Merge pull request #2856 from luisramos0/2-0-adjust-clean-up 
[Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec
 2018-10-15 11:13:46 +02:00
luisramos0
3b6d29968d Fix spree/models/adjustment_spec rubocop issues 2018-10-11 23:02:17 +01:00
luisramos0
6aa8978fe9 Convert specs to RSpec 3.7.1 syntax with Transpec 
This conversion is done by Transpec 3.3.0 with the following command:
    transpec spec/models/spree/adjustment_spec.rb

* 30 conversions
    from: obj.should
      to: expect(obj).to

* 25 conversions
    from: == expected
      to: eq(expected)

* 3 conversions
    from: obj.should_not
      to: expect(obj).not_to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-10-11 23:02:17 +01:00
luisramos0
23ed4f705c Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item 2018-10-11 23:02:17 +01:00
luisramos0
c559cf0394 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created 2018-10-02 16:17:26 +01:00
luisramos0
795441484d Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment 2018-10-02 16:15:00 +01:00
luisramos0
7dfce6c368 Making product import and product importer specs pending, 17 tests to be fixed in issue #2791 2018-09-30 00:21:43 +01:00
Luis Ramos
f0183cd17e Merge pull request #2762 from luisramos0/2-0-order-model-spec 
[Spree Upgrade] Fixed updates of order.shipping_method_id and improved order, stock_location and shipment factories
 2018-09-27 13:43:58 +01:00
Pau Perez
eb64569c9a Destroy all shipments when clearing order 
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
 2018-09-24 15:25:33 +01:00
luisramos0
4476b88044 Fixed shipping_method update in models/spree/order_spec, order.shipment is now updated instead of order.shipping_method_id 2018-09-24 15:13:36 +01:00
Luis Ramos
0eb2854f8a Merge pull request #2680 from luisramos0/2-0-stable-x 
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
 2018-09-24 15:07:04 +01:00
Pau Pérez Fabregat
99ba9d7d1b Merge branch '2-0-stable' into unit-test-variant-stock 2018-09-19 15:41:21 +02:00
Pau Perez
314ad5400f Move variant_stock.rb to concerns/ 2018-09-18 12:18:50 +02:00
luisramos0
c66b611b99 Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec 2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05 Moved shipment and shipping_method factories with flat rate and shipping fees to traits 2018-09-17 00:51:01 +01:00
Pau Perez
ce148e0197 Fix failing spec due to wrong attribute 2018-09-12 18:19:08 +02:00
luisramos0
3577f3790d Moved order.shipping_method to the OrderShippingMethod concern 2018-09-11 00:24:35 +01:00
Pau Pérez Fabregat
a906ad15bd Merge pull request #2670 from luisramos0/2-0-ship-method-adjustment-spec 
[Spree 2 Upgrade] Fix issues related to shipments in adjustment_spec
 2018-09-10 11:32:54 +02:00
Pau Pérez Fabregat
5a11af9118 Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec 
[Spree 2 Upgrade] Fixed models/order_spec issues related to order.shipping_method
 2018-09-10 11:18:10 +02:00
Maikel
bce2c1cfd5 Merge pull request #2588 from luisramos0/spree2_mail_method_specs 
Spree 2 Upgrade - MailMethod - Fix "undefined mail method" error in specs
 2018-09-10 11:28:34 +10:00
luisramos0
2f1616a286 Changed reference from order.shipping_method to order.shipments in adjustment_spec 2018-09-09 23:32:59 +01:00
luisramos0
5bcc49a61c Removed calls to the now inexistent order.create_shipment! from specs 2018-09-09 23:16:19 +01:00
luisramos0
73512d3591 Replaced order.shipping_method with order.shipments in models.order_spec. 
Fixed factory completed_order_with_fees used in order_spec and also in line_items_controller_spec and orders_controller_spec.
 2018-09-09 23:13:32 +01:00
luisramos0
afedbe45ab Fixed scenario "guest order with registered email" in order_spec 
Spree order factory requires user (we are setting it to nil below so, no impact on the test)
Defining shipping method is not necessary for this test
 2018-09-09 23:13:32 +01:00
luisramos0
d6cff9bc68 Removed calls to the now inexistent order.create_shipment! from specs 2018-09-09 23:13:27 +01:00
luisramos0
89d51d75ae Merge branch 'master' into 2-0-stable-sept 2018-09-04 17:43:20 +01:00
Maikel Linke
cebcdea40c Replace obsolete count_on_hand call for variant 
The variant factory supports only `on_hand` now.
 2018-08-30 13:55:12 +10:00
luisramos0
082f9e404b Fixed test on order_cycle_spec by replacing eq with match_array 2018-08-27 21:04:18 +01:00
luisramos0
b5038fa5dc Changed calls to MailMethod in specs to calls to Spree::Config[:mails_from] 2018-08-27 21:02:54 +01:00
Matt-Yorkley
666fbf53bf Validate enterprise.is_primary_producer? 2018-08-24 15:51:37 +10:00
Maikel
a37931afda Merge pull request #2542 from luisramos0/add_to_cart 
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
 2018-08-24 14:43:33 +10:00
Maikel
bf55190136 Merge pull request #2546 from Matt-Yorkley/pi/sku_validation 
Remove empty SKU values if empty
 2018-08-24 14:32:00 +10:00
luisramos0
910297572e Removed unnecessary currency from CartService constructor, using order.currency instead 2018-08-23 12:40:18 +01:00
luisramos0
05bfc098ff /controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator. 2018-08-23 12:39:55 +01:00
Matt-Yorkley
28b1fc076a Remove empty SKU values if empty 2018-08-16 14:29:50 +01:00
luisramos0
0b9061df28 removed Cart route, controller, model and specs: dead code 2018-08-11 22:17:12 +01:00
Pau Perez
43bf7293bf Merge branch 'master' into 2-0-stable 
* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...
 2018-07-27 10:21:47 +02:00
Pau Perez
d1e65691cf Copy distributor addr. when using a pick up method 
This copies the distributor's address when at least one of the order shipments
uses a shipping method that requires shipping address.
 2018-07-25 11:07:16 +02:00
Pau Perez
f1896313b3 Move shipping_address_from_distributor to OrderUpdater 
This is still Spree-1.3 compatible not considering multiple shipments
and shipping methods.
 2018-07-25 11:07:16 +02:00
Pau Perez
21d905a092 Refactor OrderUpdater to decorate Spree's one 
This replaces the nasty class eval and provides some encapsulation
 2018-07-25 11:07:16 +02:00
Pau Perez
72f02ee1ee RSpec3-ize OrderUpdater spec 2018-07-25 11:07:16 +02:00
Matt-Yorkley
67767f86eb Change import and reset logic to work with first page 2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b Move options to first page 2018-07-23 01:46:32 +01:00
Pau Pérez Fabregat
4f215da735 Merge pull request #2467 from mkllnk/ci-output-test 
Use progress formatter on Travis to avoid timeout
 2018-07-18 19:19:40 +02:00
Pau Pérez Fabregat
fac8e26d8b Merge pull request #2475 from Matt-Yorkley/pi/landing_page 
PI: landing page
 2018-07-18 16:47:17 +02:00
Matt-Yorkley
c7deae4253 Remove category field from inventory specs 2018-07-18 12:59:19 +01:00
Pau Pérez Fabregat
7bf27ec6b3 Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors 
2013 Remove dead code for Spree upgrade
 2018-07-18 10:38:19 +02:00
Maikel Linke
622517501c Make spec robust on slow computers 
This spec just failed in an unrelated pull request.
https://travis-ci.org/openfoodfoundation/openfoodnetwork/jobs/403435522

This change should fix it even on very slow computers.
 2018-07-13 19:10:06 +10:00
Rob Harrington
4863f2b5b4 Remove unrequired credit_card_id field from subscriptions table 2018-07-05 19:26:12 +10:00