raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 21 Branches 450 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

1757 Commits

Author SHA1 Message Date
Matt-Yorkley
f50d4fdee0 Update enterprises spec 
The bug mentioned here is no longer present (two alert boxes opened instead of one), and the old hack for Poltergeist is no longer needed. 🎉
 2021-08-10 16:22:47 +01:00
Matt-Yorkley
05dcf75ff9 Merge pull request #7990 from Matt-Yorkley/void-transactions 
Cancel payments on stock shortages
 2021-08-05 00:38:33 +02:00
Matt-Yorkley
7e3b9be506 Allow StripeSCA Gateway to actually void payments 2021-07-30 11:48:57 +01:00
Jean-Baptiste Bellet
434f9600b7 Enterprise fee must be linked with an enterprise 
Add 2 validation / errorproof options:
 - Add rails validation on `enterprise_id`  on enterprise_fee model
 - Do not add a blank option on the select: ie. user can select a blank enterprise in the form

Update tests as well
 2021-07-27 15:39:40 +02:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin 
[Adjustments] Admin adjustments
 2021-07-27 12:23:29 +02:00
filipefurtad0
0e85811cab Adds test for valid_email2 email validation 2021-07-19 18:26:52 +01:00
Andy Brett
a58e0fe217 Merge pull request #7926 from luisramos0/rubocop_fix 
Update Rubocop todo files
 2021-07-14 10:05:54 -07:00
Luis Ramos
01fe6abeed Result of rubocop -a, safe autocorrect 2021-07-13 22:38:05 +01:00
Shen Sat
2f9751f7ea Fix typo and remove WebHelper 2021-07-13 08:54:19 +01:00
Shen Sat
63cb82717b Add feature test for shipping categories 2021-07-11 19:42:41 +01:00
Matt-Yorkley
12c9914d1b Delete old Adjustment scopes #with_tax and #without_tax 2021-07-09 21:49:36 +01:00
Matt-Yorkley
9215d3292b Remove edit/delete buttons for shipping and payment adjustments 2021-07-09 21:49:35 +01:00
Matt-Yorkley
18e5fd19fa Update admin adjustment edit forms 2021-07-09 21:49:35 +01:00
Nihal Mohammed
f7795ca21a Fix failing specs 2021-06-30 09:50:38 -07:00
Nihal Mohammed
5a94e3b644 Remove duplicate shipment_state conditions from BOM spec 2021-06-24 20:01:19 +05:30
Nihal Mohammed
edca260af4 Hide shipped orders from BOM and update specs 2021-06-24 18:26:39 +05:30
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Pau Pérez Fabregat
b500486f6b Merge pull request #7211 from jibees/4207-add-query-params-in-url 
Orders list : save filters params
 2021-06-18 11:19:26 +02:00
Andy Brett
d3cca04703 update spec 2021-06-17 14:23:59 -07:00
Andy Brett
527f4e2cb3 move payment to requires_authorization if cvv_result is present 2021-06-17 14:23:59 -07:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Jean-Baptiste Bellet
89ea9913e6 Checkbox is correctly handled with null value (and not false) 
- It's better to read the comment juste below the line... 😠 (https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498)
 - Add appropriate spec so it is now correctly tested!
 2021-06-17 21:40:25 +02:00
Pau Pérez Fabregat
a8efbffca6 Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate 
[Adjustments] TaxRate changes
 2021-06-17 11:51:01 +02:00
Maikel Linke
51ad8f8065 Remove old UI to edit Terms of service 
It's now completely replaced by file uploads on a separate page.
 2021-06-09 14:06:54 +10:00
Maikel Linke
3b3ba70670 Safeguard deletion of ToS with alert 2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd Add delete method to terms of service files 2021-06-09 14:06:54 +10:00
Maikel Linke
3bee9cb951 Add Rails action #new to ToS 2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f Add upload of Terms of Service files 
Admins can upload files and view the most recent (current) one.
 2021-06-09 14:06:54 +10:00
Maikel Linke
007b8cd888 Add new admin page for TOS files 
Just the basic Rails setup without any functionality yet.
 2021-06-09 14:06:53 +10:00
Maikel Linke
1f63bb15eb Remove executable bit from spec 2021-06-09 14:06:53 +10:00
Andy Brett
b6f6407c31 Merge pull request #7660 from jibees/7499-remove-feature-toggle-for-unit-price 
Remove feature toggle around unit_price
 2021-06-08 10:39:32 -07:00
Andy Brett
fe62a0a2a7 Merge pull request #7697 from jibees/7689-trigger-a-change-when-hour/minute-inputs-are-modified 
Datetimepicker for order cycles: add keyup event listener on hour/minute inputs
 2021-06-08 10:32:07 -07:00
Jean-Baptiste Bellet
e3f56556cf Remove feature toggle around unit_price and enable it 2021-06-07 20:53:45 +02:00
Matt-Yorkley
5bfe079262 Update Xero Invoices test setup 
Uses the new format of enterprise fee taxes
 2021-06-06 20:20:41 +01:00
Matt-Yorkley
c2211c501d Improve test setup in Xero Invoices spec 2021-06-06 20:16:03 +01:00
Matt-Yorkley
6c340f8ed4 Update SalesTax test setup 2021-06-06 20:16:03 +01:00
Matt-Yorkley
8479d4ff7c Update outdated calls to TaxRate#adjust in specs 2021-06-06 20:16:03 +01:00
Matt-Yorkley
d5edf03042 Update reports_spec test setup 2021-06-04 17:10:50 +01:00
Andy Brett
b3e08b47b9 set Stripe api key directly instead of using allow 2021-06-01 22:33:12 +01:00
Jean-Baptiste Bellet
60f3ebca62 Check whether the changes made by the keyboard are taken into account in datetimepicker 
- User can change minute directly with keyboard, and without closing the datetimepicker, the modification should be catch and then a label "You have unsaved changes" with the "Save changes" button should appear
 2021-06-01 12:05:03 +02:00
Jean-Baptiste Bellet
f167b09397 Add distributor and order cycle selectors in the test 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
54c645e33a Add tests for clearing all filters feature 
- and check each filter is well reinitialized
 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
4f50afc188 Change shipping_method_id storage: in the query 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
e388238a25 Add tests for saving filter params in Orders list 2021-05-31 10:44:12 +02:00
Pau Pérez Fabregat
0f78b5b315 Merge pull request #7616 from jibees/7602-unit-price-not-displaying-when-comma-is-the-decimal-separator 
Backoffice: Unit price not displaying when comma is the decimal separator
 2021-05-27 17:45:19 +02:00
Pau Pérez Fabregat
bfa77baae1 Merge pull request #7542 from jibees/6359-add-payment-method-description-to-invoice 
Add payment method description to invoice
 2021-05-27 11:01:07 +02:00
Matt-Yorkley
74f27544f7 Merge pull request #7647 from andrewpbrett/default-country-codes 
Use correct default country code
 2021-05-25 11:21:34 +02:00
Andy Brett
120fc4ca42 Merge pull request #7605 from filipefurtad0/import_item_products 
Products and Inventory import: Items units
 2021-05-24 14:17:43 -07:00
Jean-Baptiste Bellet
afe97bcc96 Add tests for creating/editing product/variant cases with decimal price 2021-05-24 10:55:05 +02:00
Jean-Baptiste Bellet
8af6fedf8a Factorize js:true as a common configuration around all tests 2021-05-24 10:55:05 +02:00