raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,829 Commits 18 Branches 453 Tags
6b84fbf2b8a536ea633f2ee814b3398de89fbd72
Commit Graph

1078 Commits

Author SHA1 Message Date
filipefurtad0
6b84fbf2b8 Adds after block, to remove configurations 
Sets pending shared examples
 2023-06-29 10:40:01 +02:00
filipefurtad0
504ee50dd4 Sets up a spec for #11085 2023-06-29 10:40:00 +02:00
Maikel
dd1e1328cc Merge pull request #11080 from rioug/fix-bulk-order-cancelation-spec 
Fix bulk order cancellation test
 2023-06-29 14:44:04 +10:00
Maikel Linke
029364d4a3 Express spec intent with DSL instead of comment 2023-06-29 14:25:50 +10:00
Matt-Yorkley
a0a1f8f910 Merge pull request #11002 from openfoodfoundation/voucher-prep 
Vouchers part 1
 2023-06-28 11:30:12 +01:00
Filipe
748cdaaa52 Merge pull request #10963 from jibees/10956-orders-page-uncaught-error-missing-target-element-tooltip-for-tooltip-controller 
Admin, Orders list: add tooltip on Edit action icon + capitalize tooltip (instead of uppercasing)
 2023-06-27 09:58:34 +01:00
Maikel
a7915b8089 Merge pull request #10849 from mkllnk/report-cable 
Show "loading" screen for background reports and display when ready
 2023-06-26 10:25:48 +10:00
Cillian O'Ruanaidh
8ab077bed8 Create enterprise inside :it block because it's only needed there so far 2023-06-25 19:01:42 +02:00
Cillian O'Ruanaidh
1984a1feeb Use more readable click_button helper instead of find and click in users_and_enterprises_spec.rb 2023-06-25 19:01:42 +02:00
Cillian O'Ruanaidh
40b0bfb433 Add an OFN UID column to the Users & Enterprises report 2023-06-25 19:01:42 +02:00
Maikel
e065910d2d Merge pull request #10939 from Matt-Yorkley/master-variants 
Remove master variants
 2023-06-23 13:42:58 +10:00
Jean-Baptiste Bellet
7ce3c3f447 Overide a text-transform: uppercase to capitalize 
Inherit comes from `app/webpacker/css/admin/components/buttons.scss`
 2023-06-22 14:15:43 +02:00
Jean-Baptiste Bellet
91d24ba8ab Add Edit tooptip for action icon in orders table 2023-06-22 14:15:43 +02:00
Gaetan Craig-Riou
ea73781668 Fix bulk order cancellation 
Add unticking of "send cancellation email to customer" to match
the current test expectation
 2023-06-20 10:03:55 +10:00
Matt-Yorkley
0703bb4583 Remove unused is_master references in tests 2023-06-16 21:23:44 +01:00
Matt-Yorkley
8247dce2dc Improve validation feedback on new variant page and add test coverage 2023-06-16 21:23:44 +01:00
Matt-Yorkley
618900767f Fix flaky spec: use milliseconds in cache service and remove sleep 2023-06-16 21:23:44 +01:00
Matt-Yorkley
3ef7d2c9ff Remove master variant from product 2023-06-16 21:23:44 +01:00
Matt-Yorkley
7dc1091bc2 Migrate product image from master variant to product 2023-06-16 21:23:44 +01:00
Matt-Yorkley
6b9b5ea347 Stop storing unit_value and unit_description on master variant 2023-06-16 21:21:40 +01:00
Matt-Yorkley
1b06c20197 Stop using master variant as a potential store for prices 2023-06-16 21:21:40 +01:00
Mohamed ABDELLANI
65bc8e23c1 move update instructions to let blocks 2023-06-16 06:50:45 +01:00
Mohamed ABDELLANI
2b79258fdc renamed: spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order.rb -> spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb 2023-06-16 06:39:38 +01:00
Mohamed ABDELLANI
2cfa435b54 Update spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
e9671e4e1f test enterprise fees with tax report by order 2023-06-16 06:35:01 +01:00
filipefurtad0
598f69f42f Clears cache around examples 
for specs testing cache
 2023-06-15 11:28:01 +01:00
Matt-Yorkley
93df70c0a7 Use order total excluding discounts in voucher calculations 2023-06-14 10:19:30 +01:00
Matt-Yorkley
11382a518e Fix test setup in BOM spec 2023-06-14 10:19:30 +01:00
Matt-Yorkley
a0d0f8fd2f Tidy up checkout tax spec 2023-06-14 10:19:30 +01:00
Maikel Linke
c2605b2606 Display loading spinner before quick reports 
We had a race condition that could first display the report and then
replace it again with the "loading" spinner. That doesn't seem to happen
now that we changed the order of cable events.
 2023-06-14 15:40:52 +10:00
Matt-Yorkley
074eb4b592 Move tax charge logic out of checkout controller and update payment transition 2023-06-13 17:53:46 +01:00
Matt-Yorkley
8d633234f4 Set voucher specs to pending temporarily 2023-06-13 14:58:16 +01:00
Matt-Yorkley
0e289a23c1 Set some legacy checkout specs that we might want to rewrite later to pending 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
7e84579aa3 spec/system/consumer/shopping/checkout_stripe_spec 
these tests are using the legacy checkout
 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
bd0e7cdfc8 remove legacy checkout tests 2023-06-13 14:58:16 +01:00
Sigmund Petersen
c2305615a6 Merge pull request #10971 from filipefurtad0/mouse_hover_spec 
Adds spec for tooltips on orders page
 2023-06-12 09:53:16 +02:00
Konrad
fc09f95fa1 Merge pull request #10961 from jibees/10946-white-label-trix-editor-changes-on-the-custom-tab-content-do-not-trigger-the-update-button 
[WhiteLabel] Make update button active when changing custom tab content
 2023-06-09 21:46:02 +02:00
Konrad
13037d2d9d Merge pull request #10949 from jibees/10630-buu-as-an-enterprise-user-i-can-see-the-back-office-with-new-brand-colours 
[`admin_style_v3`] As an enterprise user i can see the back office with new brand colours
 2023-06-09 21:24:01 +02:00
Konrad
d0f4c44add Merge pull request #10938 from jibees/10931-white-label-custom-tab-without-a-title-impossible-to-disable-the-custom-tab 
[White Label] Validate the presence of a custom tab title before creating it (+ max 20 characters length)
 2023-06-09 19:01:13 +02:00
Konrad
502b5e8664 Merge pull request #10937 from jibees/10900-white-label-remove-ofn-navigation-for-small-width-screens 
[White Label] Remove ofn navigation for small width screens as well when option is activated
 2023-06-09 16:28:22 +02:00
filipefurtad0
24913476ac Adds spec for tooltips on orders page 2023-06-09 11:23:42 +01:00
Maikel Linke
ec865627d2 Wait for page setup to avoid flaky spec 
I'm hiding a real bug here. There's a race condition when the cable event of
the finished report is sent before the loading spinner rendered. The
spinner then overwrites the report again. I added a spec for that but
don't have a solution yet.

I also noticed that the loading spinner is not displayed in testing but
we can assert on the CSS class of the container.
 2023-06-09 16:22:01 +10:00
Jean-Baptiste Bellet
74fd1814e4 Create a trixeditor controller and broadcast a change event on form 
Therefore, AngularJS can set form as dirty

+ add associated spec
 2023-06-09 08:03:17 +02:00
Matt-Yorkley
7caf4b03d4 Improve flakyness on report specs 2023-06-09 14:44:53 +10:00
Matt-Yorkley
b230b37284 Update report email spec 2023-06-09 14:44:53 +10:00
Matt-Yorkley
f4261b85b8 Merge pull request #10940 from Matt-Yorkley/order-tidyup 
Order class tidyup
 2023-06-08 15:06:59 +01:00
Filipe
7974e1eaa6 Merge pull request #10936 from abdellani/fix-order-progressing-automatically-on-BOO 
fix Viewing an order in state "confirmation" changes the state to "complete"
 2023-06-08 14:50:04 +01:00
Jean-Baptiste Bellet
d1d050e6a4 Limit size to 20 char for the custom tab title 2023-06-08 11:27:07 +02:00
David Cook
e2ba18f828 Set sentence case tab names in Ruby instead of CSS 
I chose .capitalize instead of .humanize, because the latter has extra features which may not be desired.
 2023-06-08 11:24:44 +02:00
Maikel Linke
4ecbbae55e Adapt large browser window as default 
We were really close to that anyway. It simplifies the code a bit.
 2023-06-08 13:51:29 +10:00