raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,785 Commits 21 Branches 450 Tags
a1905e43f71a423ecc95cf00a940e5ae206bc6b8
Commit Graph

11785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
a1905e43f7 Move a group of translations related to customers to the js translations namespace 2019-04-15 18:12:04 +01:00
luisramos0
9662323261 Move a group of translations related to schedules to the js translations namespace 2019-04-15 17:42:45 +01:00
Hugo Daniel
abdf3b5480 Add edit subcription translation key 2019-04-15 16:27:18 +01:00
Luis Ramos
1e85bf6a68 Merge pull request #3641 from luisramos0/2-0-update-spree-2-0-4-revision 
[Spree Upgrade] Update spree revision to include last package_factory fix
 2019-04-12 22:16:15 +01:00
Luis Ramos
0f00f48f13 Merge pull request #3634 from luisramos0/2-0-fix-sample-data 
[Spree Upgrade] Fix new sample data in v2
 2019-04-11 23:07:15 +01:00
luisramos0
46278e3edd Set distributor in order and shipping methods so that refreshing shipment rates suceeds 2019-04-10 22:16:09 +01:00
luisramos0
5791eba9bd Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed 2019-04-10 22:16:09 +01:00
luisramos0
c852c616d5 Update spree revision to include last package_factory fix and update spree dependencies 2019-04-10 22:16:09 +01:00
Luis Ramos
ddd3443a86 Merge pull request #3659 from mkllnk/missing-translation 
Fix "What's this?" on admin dashboard
 2019-04-10 22:05:19 +01:00
Luis Ramos
4bf9320be8 Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees 
Close adjustments so that updates are effective
 2019-04-10 21:58:22 +01:00
Luis Ramos
83a4771cdd Merge pull request #3720 from Matt-Yorkley/spree2/translations 
Subs: missing translations
 2019-04-10 21:47:47 +01:00
Luis Ramos
984155013c Merge pull request #3648 from luisramos0/2-0-fix-ui-issue 
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
 2019-04-10 21:46:40 +01:00
Luis Ramos
97c920f1b0 Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments 
3477 Render only eligible adjustments on the order page
 2019-04-10 21:44:16 +01:00
Matt-Yorkley
e486a94fb4 Add missing translations in subscriptions 2019-04-10 12:16:31 +01:00
Matt-Yorkley
3578d82cbf Merge pull request #3718 from luisramos0/2-0-fix-build 
[Spree Upgrade] Add order distributor to shipping method in reports_spec
 2019-04-10 12:14:00 +01:00
luisramos0
e4c54a4954 Add order distributor to shipping method in reports_spec 2019-04-09 23:26:14 +01:00
Luis Ramos
4478d51aee Merge pull request #3668 from luisramos0/2-0-stable-Mar29 
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
 2019-04-09 17:46:36 +01:00
Luis Ramos
449e58723d Merge pull request #3591 from luisramos0/2-0-fix-migrations 
[Spree Upgrade] Fix Migrations to 2.0
 2019-04-09 13:16:34 +01:00
Luis Ramos
ef2e00ae31 Merge pull request #3604 from luisramos0/2-0-fix-splitters 
[Spree Upgrade] Override default spree splitters config
 2019-04-09 09:19:00 +01:00
luisramos0
e9491cecab Fix flaky spec by having only one variant with display name small bag 2019-04-06 10:14:19 +01:00
luisramos0
258a9efa0d Adapt product_importer_spec to ofn v2 where there’s no product.count_on_hand and on_hand does not default to infinity if product.on_demand 2019-04-05 22:09:46 +01:00
luisramos0
bb4cec1186 Fix order_and_distributor_report_spec by setting ofn shipping method the ofn v2 way 2019-04-05 22:06:44 +01:00
luisramos0
ecc60f3b61 Merge branch 'master' into 2-0-stable-Mar29 2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat
0c75a070c6 Merge pull request #3650 from kristinalim/fix/2786-address_subscription_confirm_job_failing_specs 
3487,2786 [Spree Upgrade] Address spec failures for SubscriptionConfirmJob
 2019-04-05 15:45:41 +02:00
Pau Perez
3e7e24d700 Make VariantController specs aware of destroy call 
In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so
stubbed calls needed fixing.
 2019-04-05 15:38:10 +02:00
Pau Pérez Fabregat
10165c4246 Merge pull request #3680 from kristinalim/fix/3285-db_migration_bang_shipping_rates 
[Spree Upgrade] Bang version of create in DB migration for shipping rates
 2019-04-05 15:11:41 +02:00
Pau Pérez Fabregat
1b55d04963 Merge pull request #3673 from Matt-Yorkley/spree2/css 
Spree2/css
 2019-04-05 14:57:57 +02:00
Pau Pérez Fabregat
67376a29a6 Merge pull request #3694 from Matt-Yorkley/db2fog 
Fix outdated db2fog initializer
 2019-04-05 12:26:07 +02:00
Pau Pérez Fabregat
07888b355a Merge pull request #3679 from mkllnk/3477-missing-v2-translation 
Add missing translation for order form in v2
 2019-04-04 14:25:05 +02:00
Matt-Yorkley
9b45269cbb Fix name of Spree::Config preference 2019-04-04 13:06:05 +01:00
Matt-Yorkley
7522594b85 Fix outdated db2fog initializer 2019-04-04 12:02:57 +01:00
Maikel Linke
84501b9e41 Move feature spec to controller spec 
It reduces the runtime (3s instead of 10s).
 2019-04-04 17:01:44 +11:00
Maikel Linke
7b116c0982 Remove unnecessary condition from spec 2019-04-04 16:51:18 +11:00
Maikel Linke
72458da465 Comply to code convention using I18n.t in specs 2019-04-04 16:26:52 +11:00
Pau Pérez Fabregat
ec00544130 Merge pull request #3665 from mkllnk/stripe-version 
Relax stripe version requirement
 2019-04-03 17:02:40 +02:00
Pau Pérez Fabregat
c515a8f115 Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error 
Fix nil values in on_hand column
 2019-04-03 11:56:06 +02:00
Pau Pérez Fabregat
b288cb00c1 Merge pull request #3654 from mkllnk/3237-spec-overrides-in-inventory-report 
Test inventory report to use variant overrides
 2019-04-03 11:55:33 +02:00
Maikel Linke
d31b5efac6 Simplify orders helper 2019-04-03 11:15:54 +11:00
Maikel Linke
7035d57267 Better helper naming and spec cover 2019-04-03 11:13:56 +11:00
luisramos0
5e64c9f392 Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management" 2019-04-02 16:58:50 +01:00
luisramos0
5c69d6c9dc Fix page action in the backoffice when translations are long 2019-04-02 16:58:45 +01:00
luisramos0
112a57d330 Remove association between adjustments and shipments that are going to be deleted in AddUniquenessOfOrderIdToSpreeShipments 2019-04-02 12:31:39 +01:00
Kristina Lim
3035d14369 Use bang version of create! in DB migration script 2019-04-02 15:21:58 +08:00
Maikel Linke
8b6561addd Add missing translation for order form in v2 
I saw the following error on the 2-0-stable branch:

  translation missing: en.spree.line_item_adjustments

In a pending PR I change all three translations in the view file to use
lazy lookup. This commit backports the addition to the locale so that it
can be translated via Transifex before we release v2.
 2019-04-02 17:52:24 +11:00
Maikel Linke
0c846758dd Add missing translation to order form 
I saw the following error:

  translation missing: en.spree.line_item_adjustments

In this commit I change all three translations in the view file to use
lazy lookup.
 2019-04-02 17:47:36 +11:00
Maikel Linke
2a6236823f Move adjustment filtering from view to helper 2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6 Move adjustment selection to helper 2019-04-02 17:02:05 +11:00
Maikel Linke
d78c709ad2 Remove unused variables from view 2019-04-02 16:58:08 +11:00
Maikel Linke
500cf925ad Fix HTML validity and element finding in spec 
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.

Now we look at the actually displayed text to select the correct
element.
 2019-04-02 16:50:44 +11:00
Luis Ramos
9c99e64f1f Merge pull request #3316 from luisramos0/2-0-phase2-reports 
[Spree Upgrade] Phase 2 - Reports ready - all specs running and green (except enterprise fee report)
 2019-04-01 21:46:31 +01:00