raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,288 Commits 19 Branches 453 Tags
dd079c4dcecd0997c644be68de7dfe7d54305dd1
Commit Graph

24288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
dd079c4dce Merge pull request #9154 from openfoodfoundation/ability-to-desactivate-users 
Add disabled_at logic on spree users
 2022-06-21 16:57:35 +01:00
François Turbelin
606a56a64d Improve specs 2022-06-21 10:08:12 +02:00
François Turbelin
31f8864b4a Add system spec for Admin user disable feature 2022-06-21 10:08:12 +02:00
François Turbelin
76ea7089d9 Implement suggestions 2022-06-21 10:08:12 +02:00
François Turbelin
bc9dcc7cbc Block disabled users from logging in 2022-06-21 10:08:12 +02:00
François Turbelin
39a6b5d20f Add disabled_at logic on spree users 2022-06-21 10:08:12 +02:00
Maikel
f6e2cb52e0 Merge pull request #9323 from mkllnk/mime 
Restore dependency to mime-types
 2022-06-21 11:19:56 +10:00
Maikel Linke
5406978e2d Restore dependency to mime-types 
Our db2fog backups require the mime-types gem but it was removed with
paperclip. Luckily, backups have still been working because the gem was
still available.
 2022-06-21 10:52:57 +10:00
Maikel
553046addb Merge pull request #9255 from jibees/fix-admin-taxonomies-interface 
Fix admin taxonomies interface
 2022-06-21 09:41:55 +10:00
Maikel
d5bec7e538 Merge pull request #9269 from jibees/fix-@order-distributor-website-in-/order/ORDER_ID-page 
As a customer, on an order page, distributor website should link to the order that is actually showing
 2022-06-21 09:39:46 +10:00
Rachel Arnould
40f3d4df4f Merge pull request #9312 from filipefurtad0/revert_9268_supplier_totals 
Splits results per supplier on OC Distributor Totals by Supplier report
v4.2.1 		2022-06-17 10:53:19 +02:00
Jean-Baptiste Bellet
049620add7 Update all locales with the latest Transifex translations 2022-06-17 09:33:01 +02:00
jibees
d7073c03d0 Merge pull request #9294 from openfoodfoundation/transifex 
Transifex
 2022-06-17 09:31:17 +02:00
jibees
19b57aa74e Merge pull request #9246 from jibees/9228-do-not-include-shipping-method-in-the-summary-row-for-Order-Cycle-Distributer-Totals-by-Supplier-report 
Do not include shipping method in the summary row for the Order Cycle Distributer Totals by Supplier report
 2022-06-17 09:30:31 +02:00
jibees
06685fb1c1 Merge pull request #9308 from jibees/update-yarn-lock 
Update yarn.lock
 2022-06-17 09:30:12 +02:00
filipefurtad0
0a70e091cd Reverts #9268 for supplier totals 2022-06-15 13:50:22 +01:00
Jean-Baptiste Bellet
7f52789dcf Update yarn.lock 2022-06-15 10:26:26 +02:00
jibees
df6e107dd3 Merge pull request #9305 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.5.9 
Bump @storybook/addon-docs from 6.5.7 to 6.5.9
 2022-06-15 09:09:38 +02:00
jibees
64cc6d21f1 Merge pull request #9307 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.5.9 
Bump @storybook/addon-controls from 6.5.7 to 6.5.9
 2022-06-15 09:09:26 +02:00
dependabot[bot]
f04c5bace1 Bump @storybook/addon-controls from 6.5.7 to 6.5.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-15 06:41:36 +00:00
dependabot[bot]
55f4f54e18 Bump @storybook/addon-docs from 6.5.7 to 6.5.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-15 06:41:29 +00:00
jibees
95586a0e38 Merge pull request #9306 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.5.9 
Bump @storybook/server from 6.5.7 to 6.5.9
 2022-06-15 08:40:47 +02:00
dependabot[bot]
d9f82ff619 Bump @storybook/server from 6.5.7 to 6.5.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-14 09:04:50 +00:00
Maikel
e733e9a5f8 Merge pull request #9300 from filipefurtad0/enterprise_factory_logo_promo 
Adds optional promo and logo images as traits to the enterprise factory
 2022-06-14 09:19:43 +10:00
filipefurtad0
464496befa Adds traits to enterprise_factory and spec 2022-06-13 16:40:55 +01:00
filipefurtad0
9c8756bf42 Makes the spec red: deletes file attachement from assertion 2022-06-13 16:26:09 +01:00
Filipe
ef0a346076 Merge pull request #9212 from jibees/9140-assign-a-customer-to-an-order-in-admin-section 
When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form
 2022-06-13 14:57:31 +01:00
Filipe
8b7d474f4c Merge pull request #9177 from jibees/9067-save-all-data-when-submitting-the-form 
Admin, Create a new product: re-fill the form with fields values if any validation errors occurs when submitting
 2022-06-13 14:54:02 +01:00
Jean-Baptiste Bellet
bf40e59bec Should link to order.distributor website 
- order: the order summary the customer is seeing on this page
 - current_order: the order is the customer is check-outing

+ add specs
 2022-06-13 14:52:20 +02:00
Transifex-Openfoodnetwork
8b1b9f1460 Updating translations for config/locales/en_GB.yml 2022-06-13 19:54:52 +10:00
Transifex-Openfoodnetwork
0335d8ac4f Updating translations for config/locales/fr_CH.yml 2022-06-11 00:52:56 +10:00
Transifex-Openfoodnetwork
91818a256b Updating translations for config/locales/de_CH.yml 2022-06-11 00:44:06 +10:00
Filipe
9fee4f1554 Merge pull request #9203 from AgriculturaFamiliar/remove-closed-associated-adjustments-button 
Remove closed associated adjustments button
 2022-06-10 10:10:50 +01:00
Jean-Baptiste Bellet
ead112dd57 Update all locales with the latest Transifex translations v4.2.0 2022-06-10 10:10:02 +02:00
jibees
0ed99c5ebd Merge pull request #9132 from jibees/8540-handle-items-in-bulk-order-management-page 
Handle `items` in bulk order management
 2022-06-10 10:08:14 +02:00
jibees
0b9e55732d Merge pull request #9251 from openfoodfoundation/dependabot/npm_and_yarn/eventsource-1.1.1 
Bump eventsource from 1.1.0 to 1.1.1
 2022-06-10 10:07:54 +02:00
jibees
ffb4337b72 Merge pull request #9260 from openfoodfoundation/transifex 
Transifex
 2022-06-10 10:07:05 +02:00
jibees
e1fc4accab Merge pull request #9288 from mkllnk/9279-image-order-display 
Show order and admin page despite broken image
 2022-06-10 10:01:27 +02:00
Rachel Arnould
834bf04185 Merge pull request #9286 from jibees/9281-invoice-print-failed-when-enterprise-having-a-logo 
Admin, print an invoice with alternative mode: fix an issue when enterprise has a logo
 2022-06-10 10:00:40 +02:00
Maikel Linke
bec2a873de Show order and admin page despite broken image 
Avoiding:

    ActiveStorage::InvariableError

Affects the admin order page and the customer's order confirmation page.
 2022-06-10 15:35:21 +10:00
Maikel Linke
87c275a1f7 Spec order confirmation page 2022-06-10 15:35:18 +10:00
Filipe
fa74dae99c Merge pull request #9122 from apricot12/8959-Remove-addresse-without-phone 
Migration to remove addresses with empty phone number.
 2022-06-09 18:52:55 +01:00
Rachel Arnould
9e1226be28 Merge pull request #9268 from jibees/9267-Wrong-report-when-selecting-multiple-shops 
Split orders across several shops of same order cycle instead of aggregating in several Orders and Fulfilment reports
 2022-06-09 18:03:13 +02:00
Maikel Linke
d27d98419f Fix typo in address migration 2022-06-09 20:54:46 +05:30
Nihal Mohammed
870eb8961e Update migration 2022-06-09 20:54:46 +05:30
Nihal Mohammed
b6b81a38d9 Migration to nullify spree_users_bill_address_id_fk foreign key on delete and remove addresses with empty phone. 2022-06-09 20:54:34 +05:30
Filipe
0dc6fbf7e1 Merge pull request #9278 from mkllnk/sub-email 
Fix sending subscription summary emails for shops with logo
 2022-06-09 13:43:50 +01:00
Rachel Arnould
4a91919825 Merge pull request #9259 from jibees/reports-format-date-in-summary-row-as-in-normal-row 
Reports, Order Cycle Customer Totals: Format date in summary row as it's formatted in a row
 2022-06-09 14:29:01 +02:00
Jean-Baptiste Bellet
2e0851c02f Use the method logo_url 2022-06-09 14:15:41 +02:00
Maikel Linke
dd659f16c0 Correct method name for shop logo in email 2022-06-09 16:00:57 +10:00