raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,180 Commits 17 Branches 453 Tags
3ed89fc2dbaff49f2cd31ae2e97bb1fa48180d94
Commit Graph

334 Commits

Author SHA1 Message Date
Konrad
4a66b62fa7 Merge pull request #10825 from jibees/10824-remove-feature-toggle-on-white-label-feature 
Activate white label feature
 2023-05-16 13:50:58 +02:00
Jean-Baptiste Bellet
aaa9bac4dd Remove white_label feature toggle 
White label is now activated for everyone.

+ add mock for `spec/controllers/spree/orders_controller_spec.rb`
 2023-05-15 17:10:50 +02:00
Gaetan Craig-Riou
b67f5ae154 Fixing Rubocop issue 
My editor automatically remove blank character on empty line, that's
why rubocop got grumpy here.
 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
aa526a639c Checkout payment page, enable voucher "apply" button when code entered 
The "apply" button is disabled by default. If left enabled, a customer
could try to apply an empty voucher, which results in system trying
to move to the order summary step, an unexpected behaviour!
We only enable the button when something is entered in the input.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
815dcbcefe Fix translations 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
2f1fe6d096 Fix rubocop warning 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
43ab881181 Rename order association to voucher_adjustments 
The name vouchers is a bit confusing as the order is linked to a
voucher adjutment and not the actual voucher
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
a1ad25f217 Fix failing specs 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
9789911523 Rework how voucher are applied to an order and handle tax calculation 
At the time when we can apply a voucher to an order (payment step) we
don't have any data on possible taxes and payment fees. These are
calculated when we move to the summary step. So voucher are applied in
two step:
- create an "open" voucher adjustment on the order when a customer enters
a voucher code.
- when we move to the summary step, recalulate the amount and
possible tax for the voucher adjustment, once taxes and payment fees
have been included in the order. And then close the original and update
order to reflect the changes
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
d157d91054 When voucher cover more than order total, use only amount needed 
The checkout payment step will also show a warning.
The amount used is stored in the adjustment created, so we will be able
to track how much has been used down the line.
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
74a8730f04 Highlight voucher on order summary step 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
a9d9b33f7d First take at adding a voucher to an order 
Use voucher.create_adjustment to add an adjustment to the order
Currently doesn't take into account tax part
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
Jean-Baptiste Bellet
b1de28eeea When there is a white_label_logo_link pref. use it! 
+ update spec as well

 + use an an helper to get the main logo link for a shopfront

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-26 11:04:47 +02:00
Gaetan Craig-Riou
2f17a02974 Merge pull request #10726 from mkllnk/spec-email-helper 
Remove useless email test setup
 2023-04-21 15:43:19 +10:00
Jean-Baptiste Bellet
f42f513f8c Display white_label_logo image when hide_ofn_navigation is set to true 
for both desktop and mobile view
 2023-04-20 08:45:03 +02:00
Maikel Linke
9b3cfe80ff Remove useless clearing of test emails 
They are cleared by the test environment anyway.
 2023-04-20 13:35:40 +10:00
Maikel Linke
915bd19d7b Remove useless email test setup 
We always deliver emails these days.
 2023-04-20 12:18:04 +10:00
Maikel Linke
9998025687 Remove useless test header setup for emails 
Once upon a time we needed a helper to set the `from` header of emails.
This is now set in the ApplicationMailer and not necessary any more.
 2023-04-20 12:15:34 +10:00
Maikel Linke
9c88c77066 Style empty lines 2023-04-14 16:05:50 +10:00
Maikel
b0211d0930 Merge pull request #10686 from filipefurtad0/truncates_product_description 
Sets too long line truncation spec as pending
 2023-04-14 15:11:31 +10:00
Maikel
5ff1b0d358 Merge pull request #10676 from filipefurtad0/fix_spec_ts_and_cs 
Adds pending test for default ToS
 2023-04-14 14:00:32 +10:00
Jean-Baptiste Bellet
2841b42296 Specify truncate parameter as we don't always truncate description 
Only when too long.
 2023-04-12 10:34:30 +02:00
filipefurtad0
70d9cfa08e Sets too long line truncation spec as pending 2023-04-11 19:46:11 +01:00
Jean-Baptiste Bellet
e78b44b9ca Do not shows <a /> if producers is hidden 
Different style as it does not open any modal
 2023-04-11 14:27:57 +02:00
binarygit
c5779eff81 Do not open modal for producer's who are 'hidden' 2023-04-11 14:27:57 +02:00
filipefurtad0
4e92f33b1c DRYes spec; adds pending test for default ToS 2023-04-10 12:08:35 +01:00
Maikel
c11dd2c1fb Merge pull request #10642 from macanudo527/fix_rubocop_errors 
Fix Rubocop Layout/LineLength
 2023-04-05 16:11:08 +10:00
Neal Chambers
940f806e5f Fix Rubocop Layout/LineLength 2023-04-04 09:44:15 +09:00
Jean-Baptiste Bellet
89036db666 Do not use a preference, but create a new column for hide_ofn_navigation 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
4fa44e6c64 Put the white label behind a feature toggle white_label 
+ update specs as well

+ for admin section also
 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
5279be4dc6 Improve spec: visiting order confirmation with distributor 
Two cases:
 - the current distributor is the same than the order of the order confirmation page
 - the current distributor *is not* the same than the order of the order confirmation page (and has not set `hide_ofn_navigation` preference to `true`)
 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
348c1ff7da Hide the OFN navigation menu when distributor as set its preference 
Hide, when preference is true, for page:
 - shop
 - cart
 - checkout
 - order confirmation
 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
e97cd0a1fd That particular spec is actually failing ; this must be solved 2023-03-20 16:59:19 +11:00
Jean-Baptiste Bellet
a56f061663 Prepare the spec to be factorized and to be used in different context 2023-03-20 16:59:19 +11:00
Konrad
2e426c701e Merge pull request #10232 from binarygit/show-correct-error-when-user-inputs-url-as-ig-acc 
[Enterprise->Create] Show correct error message when user inputs url in instagram field
 2023-03-19 21:57:02 +01:00
Filipe
9ea6fa5c44 Merge pull request #9687 from dacook/9616-order-cycle-open-webhook 
Add webhook triggered on Order Cycle Open
 2023-03-16 17:24:22 +00:00
David Cook
fdeeab5750 Test twitter with (almost) real world example 
I discovered that twitter doesn't have 'www' in the url anymore, no '@' symbol and interestingly no trailing slash. I added back the '@' just so we can test that still.

Using a regex group we can cater for optional www in a single regex.
 2023-03-09 11:22:04 +11:00
David Cook
9e7e176cf9 Accept full URLs 
It looks like the intention was there, so I made it work.
I've included a real world example, but added capitalisation to complete the test.
 2023-03-09 11:21:52 +11:00
Rachel Arnould
02300d6bb6 Merge pull request #10496 from rioug/10479-split-checkout-fix-user-blocked-at-step1 
[split checkout] Fix bug preventing user from reaching payment step
 2023-03-08 15:44:50 +01:00
Gaetan Craig-Riou
23c4298519 Fix bug when in specific scenario user couldn't proceed to payment step 
When using a "pick up" shipping method, with a user who doesn't have a shipping address it was impossible to proceed to the payment step because shipping address was invalid.

To fix this, we ensure that "ship_address_same_as_billing" parameter is set to true when using a "pick up" shipping method.

use distributor address when shipping method doesn't require a ship address ; in doing this we follow the same logic as the legacy checkout
 2023-03-08 10:49:37 +01:00
David Cook
00a823b2fc 6. Add webhook endpoints to user developer settings screen 
Allowing creation and deleting via the user association.
It probably won't be much effort to allow editing and multiple records, but I cut it down to the minimum needed to avoid any further delays.

I couldn't find a way to test a failure in the destroy method, but decided to keep the condition because I thought it was worth having.
 2023-03-07 15:38:50 +11:00
filipefurtad0
6d05d57846 Fixes spec when introducing invalid instagram link 
It seems that only the slash at the end of the address is making it invalid, which does not correspond to the error message. This is a separate issue.
 2023-03-06 15:02:49 +01:00
binarygit
ae166ae220 Fix: User does not get stuck when going backwards while creating new ent 2023-03-06 09:29:04 +01:00
binarygit
533f7048bf [Enterprise->Create] Show correct error message when user inputs url in instagram field 2023-03-06 09:29:04 +01:00
Jean-Baptiste Bellet
c34942dbf0 Display special_instructions of order as emphasized text if present 
+ update spec as well
 2023-03-03 11:12:11 +01:00
Maikel
bccee0698f Merge pull request #10332 from jibees/8901-allow-product-description-to-show-images-in-the-shopfront 
Shopfront: Allow product description with formatting and `<img />`
 2023-03-01 09:56:41 +11:00
Maikel Linke
cb64361096 Remove old feature spec tag 
Nowadays all system specs are run in a real browser.
 2023-02-24 15:10:19 +11:00
Filipe
3ffe39d467 Merge pull request #10448 from vviekk/viv/10009 
Fixing Enterprise creation submit button behavior
 2023-02-23 16:00:53 +00:00