raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-23 05:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,369 Commits 15 Branches 458 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

34369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
7920c1c4e8 Update Customers reports spec for feature report_inverse_columns_logic 2022-06-13 14:39:12 +02:00
Jean-Baptiste Bellet
16babf8250 Don't modify params object, but use an intermediate variable 
`@params_fields_to_show`
 2022-06-13 14:39:12 +02:00
Jean-Baptiste Bellet
214a470896 Remove the report Subtype selector in the Rendering Options section 
+ add all sub-reports in the index page
all of this is behind a feature toggle
 2022-06-13 14:39:12 +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
Konrad
ba69a9fbeb Updated installation instructions 2022-06-10 15:36:43 +02: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
Jean-Baptiste Bellet
bcc4ec365d Format date in summary row as it's formatted in a row 
for order cycle customer totals report

+ update specs
 2022-06-08 12:18:50 +02:00
jibees
08cc6ab169 Merge pull request #9270 from jibees/fix-yarn-lock-file 
Update `yarn.lock` file by running `yarn` command
 2022-06-08 12:17:50 +02:00
Jean-Baptiste Bellet
5868a281a3 Update yarn.lock file with yarn command 
Probably a bad update with storybook
 2022-06-08 10:39:18 +02:00
Jean-Baptiste Bellet
3defd81ca6 Group by e.order.distributor_id on Orders & Fulfillment Reports 2022-06-08 09:47:09 +02:00
Filipe
43888f7f3c Merge pull request #9126 from mkllnk/active-storage 
[Breaking] Replace Paperclip with Active Storage
 2022-06-07 11:14:39 +01:00
Jean-Baptiste Bellet
2c2c48071d Since query_result method is the same, use inheritance 2022-06-07 10:53:25 +02:00
jibees
256ae5b743 Merge pull request #9265 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.5.7 
Bump @storybook/server from 6.5.6 to 6.5.7
 2022-06-07 10:19:43 +02:00
jibees
d9ae67e2e7 Merge pull request #9264 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.5.7 
Bump @storybook/addon-controls from 6.5.6 to 6.5.7
 2022-06-07 10:19:31 +02:00
dependabot[bot]
2a2662ecb3 Bump @storybook/server from 6.5.6 to 6.5.7 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/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-07 07:50:02 +00:00
dependabot[bot]
e268410849 Bump @storybook/addon-controls from 6.5.6 to 6.5.7 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/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-07 07:49:48 +00:00
jibees
f548afba3e Merge pull request #9263 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.5.7 
Bump @storybook/addon-docs from 6.5.6 to 6.5.7
 2022-06-07 09:49:09 +02:00
dependabot[bot]
fb95c3de27 Bump @storybook/addon-docs from 6.5.6 to 6.5.7 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/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-06 09:05:50 +00:00
Transifex-Openfoodnetwork
0225d84c07 Updating translations for config/locales/ko.yml 2022-06-05 23:22:19 +10:00
Transifex-Openfoodnetwork
53308beb58 Updating translations for config/locales/en_FR.yml 2022-06-03 17:52:49 +10:00
Transifex-Openfoodnetwork
8eae912510 Updating translations for config/locales/fr.yml 2022-06-03 17:52:05 +10:00
Transifex-Openfoodnetwork
252c385e5e Updating translations for config/locales/de_DE.yml 2022-06-03 17:07:47 +10:00
Maikel Linke
3e3fc4a5a2 Update translations v4.1.34 2022-06-03 10:43:36 +10:00
Filipe
4a2fd10bdb Merge pull request #9237 from mgrigoriev8109/bug/update-tracking-font 
Fix shipped email tracking information font size
 2022-06-02 18:37:27 +01:00
Filipe
1a2c1d004c Merge pull request #9239 from kvaithin/9233-spacing-between-btns 
Add spacing between coordinator dropdown and continue button
 2022-06-02 18:35:08 +01:00
Filipe
6ff2d4a9d5 Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site 
Adding a link to enterprise's own site from Order confirmation page.
 2022-06-02 17:59:03 +01:00
Filipe
b3d81154e6 Merge pull request #9174 from georgethoppil/nan-items-subscription 
Updating order cycle will ensure any $NaN subscription item prices to be recalculated
 2022-06-02 17:28:54 +01:00
Jean-Baptiste Bellet
68bd1df312 Handle rename with context menu on the first taxon ie. the root one 
Also rename the main input field (sort of title) when updating the root taxon name with contextual menu
 2022-06-02 16:03:16 +02:00
Jean-Baptiste Bellet
4bbbae68c7 Do not send parent_id is it's something else than a number 
When moving element on top, `new_parent.attr("id")` was `taxonomy_tree` which was causing DB error
 2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
817b5f437f Authorize :position params 2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
121c9eed3b Replace Spree.url().clone() by new URL() 2022-06-02 15:41:44 +02:00