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,751 Commits 21 Branches 450 Tags
e486a94fb4e121a030d725a6b6cc5a7bed204ba7
Commit Graph

11751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Luis Ramos
d48d2a748b Merge pull request #3662 from SDBowen/add_shipping_method 
Add shipping method name to orders detail report
 2019-04-01 15:37:57 +01:00
Matt-Yorkley
668a37f564 Fix "clear all" button spacing in inventory 2019-04-01 12:18:19 +01:00
Matt-Yorkley
4a0e5a42a3 Fix admin menu items different heights 2019-04-01 12:11:29 +01:00
Matt-Yorkley
082be15df2 Fix admin menu mixed font weights 2019-04-01 12:00:29 +01:00
Matt-Yorkley
fa91a66de6 Fix button padding after Spree 2 font changes increased the vertical height 2019-04-01 11:48:18 +01:00
Matt-Yorkley
3ad2c9f7c4 Fix 'clear all' button width on Order Cycles page 2019-04-01 11:41:46 +01:00
Kristina Lim
d866fad46e Persist variants in customer totals specs 
This is to properly record the on hand quantity.
 2019-03-31 18:32:09 +08:00
luisramos0
bc8bca074c Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4 
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
 2019-03-29 22:16:39 +00:00
luisramos0
1fc4b7fd2a Add manual shipping adjustment 
For some reason this adjustment is not being added to order through the callbacks as it was before. See PR #3371
 2019-03-29 22:16:39 +00:00
luisramos0
d713c755e6 Uncomment report specs so we can make them work in v2 2019-03-29 22:16:38 +00:00
luisramos0
527cfc1601 Merge branch 'master' into 2-0-stable-Mar29 2019-03-29 13:48:49 +00:00
Maikel
7348987567 Merge pull request #3315 from luisramos0/2-0-phase2-pi 
[Spree Upgrade] Phase 2 - Product Import ready - all specs running and green
 2019-03-29 15:16:35 +11:00
Maikel
6e31f0078a Merge pull request #3639 from coopdevs/fix-variant-cache-refreshing-on-delete 
Fix variant cache refreshing on delete
 2019-03-29 15:12:46 +11:00
Maikel Linke
29f32604f2 Relax stripe version requirement 
We are using the latest version of the `stripe` gem. We don't depend on
any particular version. I'm proposing to drop our dependency declaration
on a particular version and just track the current used version in
Gemfile.lock. That means fewer code changes when updating, which happens
quite frequently with this gem.
 2019-03-29 13:40:51 +11:00
Maikel
973ae3d43a Merge pull request #3656 from openfoodfoundation/dependabot/bundler/stripe-4.11.0 
Bump stripe from 4.10.0 to 4.11.0
 2019-03-29 13:39:08 +11:00
sdbowen
0f7ef2671f Add shipping method name to orders detail report 
Added column allows users to see the shipping method of each order.
 2019-03-28 16:08:10 -06:00
luisramos0
3742c70910 Add backup process to AddUniquenessOfOrderIdToSpreeShipments so that the deleted duplicated shipments can be recovered if something goes wrong 2019-03-28 18:49:38 +00:00
Maikel
fed2b60743 Merge pull request #3644 from kevinchristianson/master 
Fixed producer profile translation bug
 2019-03-28 15:51:45 +11:00
Maikel
6978e3fdb6 Merge pull request #3658 from mkllnk/3582-shipping-method-spec 
Wait for entered tag before submitting
 2019-03-28 13:46:56 +11:00
Maikel
74aea76c4c Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit 
[Spree Upgrade] Finish up deleting account invoices
 2019-03-28 13:42:01 +11:00
Kristina Lim
f0746eb643 Use :performing_deliveries in spec 2019-03-28 02:04:13 +08:00
luisramos0
b780823970 Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment 2019-03-27 14:10:51 +00:00
Luis Ramos
4455073f6d Merge pull request #3647 from luisramos0/fix-shipment-state-translation 
Add missing translation key for order shipment state canceled
 2019-03-27 13:02:14 +00:00
Maikel Linke
ef882b8293 Wait for entered tag before submitting 
The changed spec was failing from time to time. This change seems to
make it stable. It may be worth moving tag entering into a helper that
verifies that the tag was entered (waits for it).
 2019-03-27 10:58:00 +11:00
dependabot[bot]
6c97bb6cac Bump stripe from 4.10.0 to 4.11.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.10.0...v4.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 19:25:43 +00:00