raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cillian O'Ruanaidh
9a6e8a1113 Add an OrderCycleShippingMethod model to handle attaching shipping methods to order cycles 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
94d71b8dce Remove extra unnecessary :display_on_checkout scope and reuse :frontend scope instead 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a5daee39e3 Extract out a DISPLAY_ON_OPTIONS constant in Spree::ShippingMethod instead of magic strings 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
37617f63ea Remove non-functional :backend scope from Spree::ShippingRate 
It finds shipping methods where 'display_on != front_end' but :front_end values were removed in a1317be19b/db/migrate/20200508101630_convert_frontend_shipping_method_to_both.rb so it will always return true.
 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9b5f743fa5 Extract out a OrderCycle#simple? method so it can be used in models 2022-09-30 13:13:39 +01:00
Filipe
e85dd99e04 Merge pull request #9633 from binarygit/add-stimulus-reflex 
Add StimulusReflex
 2022-09-29 17:11:18 +01:00
binarygit
ebe4a3d6ab Add StimulusReflex 2022-09-29 16:03:45 +02:00
jibees
382f8c38f6 Merge pull request #9712 from jibees/solve-uglifier-error 
Remove now unnecessary uglifier gem
 2022-09-29 16:02:14 +02:00
Jean-Baptiste Bellet
a024d0e5ac Remove uglifier 2022-09-29 15:24:31 +02:00
Rachel Arnould
f8f778eaa1 Merge pull request #9686 from jibees/9684-fix-search-customer-in-order-creation-for-super-admin 
Admin, New Order, Search customer: As a super admin, search for customer within all enterprises
 2022-09-29 14:35:18 +02:00
Maikel Linke
8011d85968 Clarify updating only pre-existing customers 2022-09-29 12:06:06 +02:00
Maikel Linke
a7de56460d Further simplify Order by outsourcing to service class 2022-09-29 12:06:06 +02:00
Maikel Linke
1f19642dad Simplify Order by outsourcing to service class 
This is work in progress and calling the service will be simplified in a
few commits.
 2022-09-29 12:06:06 +02:00
Maikel Linke
33d6454dd3 Simplify with guard clause 2022-09-29 12:06:06 +02:00
Maikel Linke
a0260c4ff7 Move customer update logic to own service file 
The Order class is too big already. We can move more code in the next
commits.
 2022-09-29 12:06:06 +02:00
Maikel Linke
cec81a3ae6 Clarify condition to create customer record 2022-09-29 12:06:06 +02:00
Maikel Linke
37eac5ed49 Remove dead code branch in customer check 
We only try to create a customer when none is present. So the check for
validating the customer always returned false because we didn't have a
customer.
 2022-09-29 12:06:06 +02:00
Maikel Linke
b232fa3d0c Deal with conflicting customer entries 2022-09-29 12:06:06 +02:00
Maikel Linke
f6ac02dce5 Update customer's email after user changed it 
This may fail if there's already a customer record with the same email
address for the same enterprise. I will fix that in the next commit.
 2022-09-29 12:06:06 +02:00
Maikel Linke
9dbba35019 Find customers by user id as well as email 
Also fixing up a spec which became brittle due to too much mocking.
 2022-09-29 12:06:06 +02:00
Maikel Linke
cf634d8d9b Simplify customer association 2022-09-29 12:06:06 +02:00
Maikel Linke
5fefd3b14b Remove useless customer loading and clarify name 
The method `associate_customer` only loads a customer but doesn't
actually associate one. So the deleted line doesn't have any effect.

The intention was to reset the customer after switching shops but the
before_validation logic on the order model takes care of that already.

I'm renaming this private method here for clarity.
 2022-09-29 12:06:06 +02:00
Maikel Linke
93da64f466 Spec for duplicate customers after changing email 2022-09-29 12:06:06 +02:00
Maikel Linke
0d1f48ac0d Simplify order-customer logic 2022-09-29 12:06:06 +02:00
Maikel Linke
ccbf20a73b Replace spec of customer's internal logic 
Specs should test public methods. Private methods should be able to
change without specs breaking.

The specs were also just mirroring the code and didn't really have any
meaning. So I wrote new ones which are hopefully clearer.

There's actually a case which I don't quite understand. Why don't we
require a customer for a new complete order? It means that we don't have
a customer creating it but then it's added when updating the order.
Seems inconsistent.
 2022-09-29 12:06:06 +02:00
jibees
5dc4a859f7 Merge pull request #9717 from openfoodfoundation/dependabot/bundler/view_component-2.74.0 
Bump view_component from 2.73.0 to 2.74.0
 2022-09-29 10:19:23 +02:00
jibees
9323931a21 Merge pull request #9715 from openfoodfoundation/dependabot/npm_and_yarn/babel/preset-env-7.19.3 
Bump @babel/preset-env from 7.19.1 to 7.19.3
 2022-09-29 09:33:28 +02:00
Maikel Linke
d81037d658 Simplify branching logic in SearchesController 2022-09-29 09:30:21 +02:00
Maikel Linke
12d7db3dd6 More efficient enterprise access check 2022-09-29 09:30:21 +02:00
Jean-Baptiste Bellet
cdf71b419f Search within all enterprises if user is the super admin 2022-09-29 09:30:21 +02:00
dependabot[bot]
6f6b1ce9e6 Bump view_component from 2.73.0 to 2.74.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.73.0 to 2.74.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v2.73.0...v2.74.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-29 07:02:17 +00:00
Maikel
2c2d244c56 Merge pull request #9716 from filipefurtad0/fix_reports_spec 
Fixes invert columns logic on reports spec
 2022-09-29 17:00:38 +10:00
Maikel Linke
c8cfbbb0b2 Use standard ApplicationRecord in task class 
It's best practice to use the ApplicationRecord. But when Rake is
loaded, our application is not loaded yet and the ApplicationRecord
class wasn't available yet. Requiring within the task solves the problem
because Rake loads the Rails environment before executing this task.

I also removed the unused highline loading.
 2022-09-29 11:56:10 +10:00
Maikel
c000c0dd5d Merge pull request #9709 from openfoodfoundation/dependabot/bundler/view_component-2.73.0 
Bump view_component from 2.72.0 to 2.73.0
 2022-09-29 08:23:09 +10:00
Filipe
958c6fe8f3 Merge pull request #9685 from filipefurtad0/remove_js_tracking_code 
Removes matomo JS tracking code
 2022-09-28 23:15:23 +01:00
Filipe
9cc2d30920 Merge pull request #9642 from mkllnk/9002-customer-association 
Delete duplicate customer entries
 2022-09-28 17:17:23 +01:00
filipefurtad0
e00a59212c Fixes invert columns logic on reports spec 2022-09-28 11:49:20 +01:00
dependabot[bot]
e783594385 Bump @babel/preset-env from 7.19.1 to 7.19.3 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.19.1 to 7.19.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.3/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-28 09:03:57 +00:00
Ashwini Seshadri
edee5c693b Changed new subscription dialog to use tom-select from select2 
fixed z-index, text-alignment in the dropdown menu to left in new subscription modal, replaced click_link with page.find().click in subscription specs, removed href in subscription index
 2022-09-28 10:47:39 +02:00
dependabot[bot]
fea78884e7 Bump view_component from 2.72.0 to 2.73.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.72.0 to 2.73.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v2.72.0...v2.73.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-28 07:23:18 +00:00
jibees
4f290b5bc5 Merge pull request #9707 from filipefurtad0/remove_visible_true_label 
Removes "visible: true" from system specs
 2022-09-28 09:21:19 +02:00
Maikel
52c38428e8 Merge pull request #9624 from filipefurtad0/add_vcr_to_the_stack 
Add VCR to the stack
 2022-09-28 10:48:59 +10:00
filipefurtad0
538844a1fb Removes _visible: true_ from system specs 2022-09-27 17:32:25 +01:00
filipefurtad0
4690cb102b Adds sets-up the cassettes correctly and other configs 
deletes unecessary files

Reverts helper option to turn VCR off
 2022-09-27 07:26:26 +01:00
Maikel Linke
4e33bd2713 Avoid trying to delete address referenced elsewhere 2022-09-27 13:14:51 +10:00
Maikel Linke
286dade66f Don't enforce ApplicationRecord in migrations 
We shouldn't use app code in migrations because app code changes while
migrations should always do the same to enable old servers to upgrade.

We have some existing migrations which use ApplicationRecord but I found
that changing them retrospectively breaks them already. So let's leave
them alone.
 2022-09-27 13:14:51 +10:00
Maikel Linke
591f901935 Delete duplicate customer entries 2022-09-27 13:14:49 +10:00
Maikel Linke
aec28e0807 Simplify customer model requiring enterprise 2022-09-27 13:14:18 +10:00
Maikel Linke
be31b9a897 Document purpose of customer model 2022-09-27 13:14:18 +10:00
Maikel
6783e7f74c Fix typo 2022-09-27 12:37:08 +10:00