raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th 
[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)
 2018-11-15 15:02:21 +11:00
Maikel Linke
1e312dfa41 Update test mail setup for Spree 2 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2882

The email setup differs between Spree 1 and Spree 2. We already
encapsulated that setup in a single method which now needed changing.
 2018-11-15 14:30:46 +11:00
Maikel
a25cdd90de Merge pull request #3014 from luisramos0/2-0-payments_spec 
[Spree Upgrade] Fix admin payments spec
 2018-11-15 13:02:28 +11:00
luisramos0
ece21a674a Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test 2018-11-14 23:13:05 +00:00
luisramos0
688ec5fb21 Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec 2018-11-14 23:04:38 +00:00
luisramos0
7c0627a823 Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package 2018-11-14 23:04:38 +00:00
luisramos0
a5fb3e337d New knapsack report 
New knapsack report for 2-0-stable. Makes the 4 jobs with 20 mins each.
 2018-11-14 22:58:09 +00:00
Luis Ramos
c19e954113 Merge pull request #3009 from HugsDaniel/authenticate-api-use-through-logged-in-user 
[Spree Upgrade] Authenticate API user through logged in user
 2018-11-14 14:27:30 +00:00
luisramos0
0a77eeb4b6 Merge branch 'master' into 2-0-stable-nov-14th 2018-11-14 11:35:58 +00:00
luisramos0
19321b6d4f Fix admin payments spec. Add missing payment method to order.distributor 2018-11-14 11:26:26 +00:00
Hugo Daniel
3dd981ca05 Use logged in user (spree_current_user) for API authentication (current_api_user) 2018-11-14 11:58:28 +01:00
Pau Pérez Fabregat
a65e2487c4 Merge pull request #3013 from luisramos0/2-0-api-orders-ctrl-spec 
[Spree Upgrade] Fix api/orders_controller_spec
 2018-11-14 11:48:34 +01:00
Pau Pérez Fabregat
605f84d30a Merge pull request #3010 from openfoodfoundation/transifex 
Transifex
 2018-11-14 11:27:01 +01:00
Pau Pérez Fabregat
8ee193dbcf Merge pull request #2984 from Matt-Yorkley/email_https_links2 
Specify only email link protocol setting
 2018-11-14 11:26:14 +01:00
Pau Pérez Fabregat
e66f406ea6 Merge pull request #2946 from luisramos0/improve_taxons 
Sort Product categories alphabetically by name
 2018-11-14 11:23:59 +01:00
luisramos0
2947d7a98c Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout 2018-11-13 21:25:59 +00:00
luisramos0
9b894c6a55 Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5 2018-11-13 19:51:26 +00:00
luisramos0
a234308a06 Fix credit card controller by adding a rescue for wrong arguments passed in params 2018-11-13 15:28:10 +00:00
luisramos0
2037413df7 Make some report specs xdescribe and leave them for spree upgrade phase 2 2018-11-13 14:53:42 +00:00
luisramos0
ef5d679f90 Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path 2018-11-12 16:31:57 +00:00
luisramos0
bbdbfc1374 Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work 2018-11-12 16:29:38 +00:00
Transifex-Openfoodnetwork
f9fae06a7a Updating translations for config/locales/en_BE.yml 2018-11-10 07:09:02 +11:00
Maikel
5c208a68c6 Merge pull request #3007 from openfoodfoundation/revert-2859-instagram_pattern 
Revert "Instagram pattern"
 2018-11-09 14:23:44 +11:00
Maikel
d8d20429aa Revert "Instagram pattern" 2018-11-09 13:33:11 +11:00
Maikel
57efc36448 Merge pull request #2993 from Matt-Yorkley/user_class 
Deal with failing Spree::LegacyUser test
 2018-11-09 10:21:31 +11:00
Luis Ramos
0ea0016fc9 Merge pull request #2998 from coopdevs/adapt-product-on-demand 
[Spree Upgrade] Adapt product on demand
 2018-11-08 19:21:46 +00:00
Luis Ramos
ed7c12bd26 Merge pull request #2997 from luisramos0/2-0-stable-nov-8th 
[Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)
 2018-11-08 19:20:42 +00:00
Luis Ramos
4149c95c65 Merge pull request #2991 from Matt-Yorkley/missing_resource_translation 
[Spree Upgrade] Import missing translations from Spree 2 to fix some tests
 2018-11-08 12:34:53 +00:00
Luis Ramos
30bca40ed0 Merge pull request #2996 from coopdevs/update-products-new-js-template 
[Spree Upgrade] Bring Spree changes on admin/products/new.js.erb
 2018-11-08 12:13:47 +00:00
Luis Ramos
a3da941d8f Merge pull request #2992 from Matt-Yorkley/credit-cards 
[Spree Upgrade] Failing credit card spec
 2018-11-08 12:12:34 +00:00
Pau Perez
de31823151 Add #on_demand= to make product creation page work 
We're bringing in the setter that got removed in Spree 2.0 so that we
can still pass an on_demand value from the product creation form.

However, we won't keep the getter to keep things simple. The frontend
seems to be checking the existence of variants anyway, so then it can
also check for product.master.on_demand and we avoid some logic on the
backend.
 2018-11-08 11:41:58 +00:00
luisramos0
fcdb5cd7af Merge branch 'master' into 2-0-stable-nov-8th 2018-11-08 11:18:54 +00:00
Pau Perez
18c51dc596 Bring Spree changes on admin/products/new.js.erb 
We copied it from Spree to then append a little change on it. Since the
original version changed in Spree 2.0 we need to update our copy.
 2018-11-08 10:45:04 +00:00
Matt-Yorkley
8aa6b2c0ac Stub spree_api_key on Spree::LegacyUser when signing in as regular user 2018-11-08 00:07:24 +00:00
Matt-Yorkley
edbfd64a44 Set the Spree.user_class explicitly in spree initializer 2018-11-08 00:04:04 +00:00
Matt-Yorkley
fae0617639 Merge pull request #2986 from HugsDaniel/2985-api-product-images-specs 
[Spree Upgrade] Add an API key for admin user
 2018-11-08 00:01:46 +00:00
Matt-Yorkley
3f33e28839 Fix outdated credit card spec 2018-11-07 20:48:54 +00:00
Matt-Yorkley
cfc31f1fbd Import missing translations from Spree 2 to fix some tests 2018-11-07 19:23:28 +00:00
Pau Pérez Fabregat
51a94c8194 Merge pull request #2964 from openfoodfoundation/dependabot/bundler/awesome_print-1.8.0 
Bump awesome_print from 1.0.2 to 1.8.0
 2018-11-07 18:48:32 +00:00
Matt-Yorkley
9011f5d9a2 Rescue ArgumentError and give user feedback 2018-11-07 18:48:08 +00:00
Pau Pérez Fabregat
72a9d39ee1 Merge pull request #2932 from luisramos0/2931-weight-calculator 
2931 Refactor and prepare weight calculator for spree 2
 2018-11-07 18:40:38 +00:00
Pau Pérez Fabregat
ecc69c2c58 Merge pull request #2948 from pfac/pfac-config-time-zone 
Fix default time zone config
 2018-11-07 18:39:25 +00:00
Matt-Yorkley
b5c6ecb45a Explicitly use UTF-8 encoding when opening spreadsheet files 2018-11-07 16:50:24 +00:00
Hugo Daniel
bc9af7c45f Add an API key for admin user 2018-11-07 16:47:35 +01:00
Matt-Yorkley
5b16353938 Specify only link protocol setting 2018-11-07 11:22:24 +00:00
luisramos0
b7ffde795a Add migration to update calculator class name of weight calculators 2018-11-07 09:54:53 +00:00
luisramos0
9490da329a Move Calculator::Weight from models/open_food_network/calculator to models/calculator 2018-11-07 09:54:30 +00:00
luisramos0
bf55f50a7e Fix rubocop warnings on weight and weight_spec 2018-11-07 09:54:30 +00:00
luisramos0
275a192270 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/calculator/weight_spec.rb

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

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

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-11-07 09:54:30 +00:00
luisramos0
1ef04354fd Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package) 2018-11-07 09:54:30 +00:00