raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,808 Commits 17 Branches 456 Tags
cce26cb45334ee4c8be3fcb75a2730251f849940
Commit Graph

15808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
cce26cb453 Merge branch '3-0-stable' into 3-0-stable-jun-2 2020-06-03 19:51:43 +01:00
Pau Pérez Fabregat
93dd61c6fc Merge pull request #5456 from luisramos0/3-0-stable-with-spree-deps 
[Spree 2.1] Move all spree_core dependencies to OFN so we can upgrade them later
 2020-06-03 18:57:24 +02:00
Luis Ramos
0b76a25941 Add spree_core dependencies to OFN so we can upgrade them 
This will enable us to upgrade these dependencies independently
 2020-06-03 14:25:27 +01:00
Pau Pérez Fabregat
8a62c8aeb5 Merge pull request #5544 from luisramos0/api_ctrl 
[Spree 2.1] Fix specs in Api::EnterprisesController and Api::ShopsController
 2020-06-03 09:34:43 +02:00
Pau Pérez Fabregat
833e2ff9c4 Merge pull request #5543 from luisramos0/product_stock 
[Spree 2.1] Fix product_stock spec
 2020-06-03 09:18:52 +02:00
Luis Ramos
f9d86eb7ed Join module and describe declaration so that rspec picks up correct controller under Api namespace and not the controller with the same name in the base namespace 2020-06-02 20:17:46 +01:00
Luis Ramos
251c04f2d9 Make all tests in enterprises_controller_spec use api_post instead of spree_post 2020-06-02 20:17:07 +01:00
Luis Ramos
ff0c93a76b Join module and describe declaration so that rspec picks up correct 
controller under Api namespace and not the controller with the same name
in the base namespace
 2020-06-02 20:15:25 +01:00
Luis Ramos
c68459f212 Make enterprises_controller_spec use api_post instead of spree_post 2020-06-02 20:06:52 +01:00
Luis Ramos
5fd0a6028f Merge pull request #5420 from luisramos0/pi_fix 
[Spree 2.1] Product Import - Add variant_unit_name to the list of fields to be ignored when creating a variant
 2020-06-02 18:13:48 +01:00
Luis Ramos
4438f620e9 Merge pull request #5421 from luisramos0/more_strong_params 
[Spree 2.1] Add missing strong params to less important controllers missed by specs
 2020-06-02 16:59:27 +01:00
Luis Ramos
23b677f547 Merge pull request #5388 from luisramos0/reg_proc 
[Spree 2.1] Fix enterprise package selection submit button
 2020-06-02 16:23:52 +01:00
Luis Ramos
beb1b3f3bc Replay 02d46b7c51 lost in the last merge from master 2020-06-02 16:11:03 +01:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
Luis Ramos
8bb4310cba Merge pull request #5383 from luisramos0/admin_orders_bug 
[Spree 2.1] Fix Update and Calculate Fees button
 2020-06-02 15:30:16 +01:00
Luis Ramos
89c461662f Merge pull request #5502 from Matt-Yorkley/dropshadow-regression 
[mobile ux] Fix missing drop-shadow
 2020-06-02 12:07:37 +01:00
Luis Ramos
2d7f1ce283 Delete all variants from test product not just the first one 2020-06-01 21:21:26 +01:00
Luis Ramos
a4a6431faf Fix strong params problem where order object is not sent to controller 2020-06-01 13:42:22 +01:00
Luis Ramos
48985bbcd1 Use patch instead of put, because it's rails 4 
Extend the registration process spec to cover package selection
 2020-06-01 13:41:37 +01:00
Luis Ramos
c6842ada7f Add variant_unit_name to the list of fields to be ignored when creating a variant, it's a product field 2020-06-01 13:41:15 +01:00
Luis Ramos
754b657f81 Move controller methods to protected to keeep consitency and isolation 2020-06-01 13:40:59 +01:00
Luis Ramos
bae128738b Add spec for return authorizations controller 2020-06-01 13:40:59 +01:00
Luis Ramos
583b4a1df7 Add spec to countries_controller 2020-06-01 13:40:59 +01:00
Luis Ramos
73f2844fe3 Add spec for shipping categories 2020-06-01 13:40:59 +01:00
Luis Ramos
e77d9aba7b Add missing strong params to less important controllers not tested in specs 2020-06-01 13:40:59 +01:00
Matt-Yorkley
1e3bf7fec4 Merge pull request #5487 from coopdevs/fix-schedule-factory 
[Spree 2.1] Allow to create order_cycle_schedules
 2020-05-30 13:49:47 +02:00
Luis Ramos
c01da01c70 Merge pull request #5518 from openfoodfoundation/dependabot/bundler/ddtrace-0.36.0 
Bump ddtrace from 0.35.2 to 0.36.0
 2020-05-30 11:05:40 +01:00
Pau Perez
24e897d145 Do not build OC with schedules at the same time 
It's not possible when neither the OC nor the schedule has an id due to
the new join table order_cycle_schedules.
 2020-05-29 17:00:52 +02:00
Pau Perez
538c53fe9e Improve code readability 
Also removing an useless vars
 2020-05-29 15:56:05 +02:00
Matt-Yorkley
c73defa8a1 Merge pull request #5494 from Matt-Yorkley/group-maps-fix 
Fix group maps
v2.9.11 		2020-05-29 12:05:55 +02:00
Pau Pérez Fabregat
c0ad992352 Merge pull request #5465 from luisramos0/rename_accessible_by 
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
 2020-05-29 12:04:19 +02:00
Pau Pérez Fabregat
8d1944d714 Merge pull request #5506 from Matt-Yorkley/3-0-dfc-specs 
[Spree 2.1] DFC specs updates
 2020-05-29 11:43:19 +02:00
Pau Perez
815cd73ff3 DRY specs 2020-05-29 11:15:47 +02:00
Pau Perez
032dce1a88 Move OC save within success block 
This makes more evident there are two scenarios: schedule save success
or failure. We deal with OCs failures raising an exception.
 2020-05-29 10:46:29 +02:00
Pau Perez
768568c75c Rename @object to @schedule 
This level of abstraction makes sense in the framework-like code in
ResourceController but here it just makes things more difficult.
 2020-05-29 10:44:43 +02:00
Pau Perez
4f3d01bd93 Remove unused HTML response format 2020-05-29 10:43:16 +02:00
Pau Perez
56b590a6f8 Extract #sync_subscription 
This makes it far easier to spot what's the difference between create
and update regarding subs syncing without having to mess with `#update`
and its callbacks (for now).
 2020-05-29 10:41:42 +02:00
Pau Perez
65c53df2ef Remove unnecessary callback invocations 
There are no registered callback methods to execute.
 2020-05-29 10:25:38 +02:00
Pau Perez
f25ee8c998 Extract #editable_order_cycles 
This makes it far easier to spot what's the difference between create
and update regarding the editable order cycles.

I stop here before a slightly deeper refactor which would make the PR
quite hard to review. This will come an upcoming one.
 2020-05-29 10:25:37 +02:00
Pau Perez
862364ebbb Fix schedule destroy spec 2020-05-29 10:24:50 +02:00
Pau Perez
4f635339e3 Fix schedule creation and subs syncing 2020-05-29 10:24:42 +02:00
Maikel
2f82a58055 Merge pull request #5365 from mbudm/task/orderCycleSpecSplit 
Split order_cycle_spec into smaller specs grouped by theme
 2020-05-29 13:46:42 +10:00
Luis Ramos
2203bca1ce Merge pull request #5489 from luisramos0/3-0-stable-may-22 
[Spree 2.1] Merge master into 3-0-stable
 2020-05-28 19:55:14 +01:00
Luis Ramos
bb8401a0fc Merge pull request #5444 from luisramos0/dead_js_code 
Remove some dead JS code related to admin sub menus
 2020-05-28 19:54:42 +01:00
Luis Ramos
83edfbd1dd Merge pull request #5266 from luchiago/improve-order-cancellation-email 
Improve order cancellation email
 2020-05-28 19:48:26 +01:00
Pau Perez
9a29e634fc Deal with Schedule creation in its own controller 
This way it can assign the order cycles to the schedule when this is
persisted. An OrderCycleSchedule (the join table) can't be created until
both schedule and order_cycle got an id.

Also, we do not call `#adapt_params` when creating the Schedule as that
assigns `order_cycle_ids` to `@object.attributes` thus, attempting to
create the OrderCycleSchedule without a schedule_id.
 2020-05-28 17:49:36 +02:00
Pau Perez
06b7a95fb1 DRY duplicate subscription declaration 2020-05-28 14:00:53 +02:00
Matt-Yorkley
ea7a2c91ee Update all locales with the latest Transifex translations 2020-05-28 13:12:12 +02:00
Matt-Yorkley
2ae84ad710 Merge pull request #5491 from openfoodfoundation/transifex 
Transifex
 2020-05-28 13:08:36 +02:00
dependabot-preview[bot]
8632383e60 Bump ddtrace from 0.35.2 to 0.36.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.35.2 to 0.36.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.35.2...v0.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-27 20:23:11 +00:00