raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,068 Commits 18 Branches 452 Tags
e20c2e3ced13970751c049dcf82ece858fbb94cd
Commit Graph

24068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Castro
e20c2e3ced Report Refactor 1: Orders & Distributors 2022-05-12 16:54:13 +02:00
Sebastian Castro
01be6fb1f3 Report Refactor 1: Order Cycle Management 2022-05-12 16:54:13 +02:00
Sebastian Castro
1fee45035c Report Refactor 1: Customers 2022-05-12 16:54:12 +02:00
Sebastian Castro
e55462d18b Report Refactor 1: Orders & Fulfilment 2022-05-12 16:54:12 +02:00
Sebastian Castro
09247b21cd Reports Refactor 1 
Use code closer to the new packing report controller
Handle nil @report_subtypes
 2022-05-12 16:54:12 +02:00
Sebastian Castro
209b56ffd7 Packing Report: Better print 2022-05-12 16:54:12 +02:00
Sebastian Castro
cbb6bd63d4 Print: load css, hide navbar 2022-05-12 16:54:12 +02:00
Sebastian Castro
213c0dd060 Packing Report: add price and reorder columns 
Adds price column
last_name column first because it's used for ordering
 2022-05-12 16:54:12 +02:00
Sebastian Castro
d53d38906a Packing Report: Refactor view to be reusable by other reports 
For now this view is used only in the context of packing, but later we would move all existing rpeort to use same view
 2022-05-12 16:54:12 +02:00
Sebastian Castro
1ff98a1d8a Reports: Improve UI 2022-05-12 16:54:12 +02:00
Maikel Linke
aafa416b9c Transifex update v4.1.30 2022-05-12 12:22:36 +10:00
Maikel
cae032a224 Merge pull request #9162 from openfoodfoundation/transifex 
Transifex
 2022-05-12 12:18:52 +10:00
Transifex-Openfoodnetwork
372939b260 Updating translations for config/locales/nb.yml 2022-05-12 11:26:47 +10:00
Transifex-Openfoodnetwork
8945d0cc33 Updating translations for config/locales/en_FR.yml 2022-05-12 11:23:43 +10:00
Transifex-Openfoodnetwork
8b05fb2210 Updating translations for config/locales/en_GB.yml 2022-05-12 11:23:40 +10:00
Maikel
c00a35b5a4 Merge pull request #9173 from jibees/9172-change-i18n-key-from-delivery-address-to-shipping-info 
Split Checkout: Change i18n key on first step from delivery address to shipping info
 2022-05-12 10:36:18 +10:00
Transifex-Openfoodnetwork
38d6b5d452 Updating translations for config/locales/ru.yml 2022-05-12 00:17:55 +10:00
Filipe
6141641c23 Merge pull request #9164 from jibees/9143-add-order-token-when-checkout-is-complete 
Add `order_token` params to the redirect URL after checkout
 2022-05-11 13:50:48 +01:00
Jean-Baptiste Bellet
d942adcdd0 Change i18n key on first step 
Delivery address --> shipping info
 2022-05-11 10:11:51 +02:00
Maikel
bfc3e385ba Merge pull request #9163 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.0.2 
Bump tom-select from 2.0.1 to 2.0.2
 2022-05-11 14:02:25 +10:00
Jean-Baptiste Bellet
61f8dfd809 Add order_token params to the redirect URL after checkout 2022-05-09 17:45:52 +02:00
dependabot[bot]
51db3d5997 Bump tom-select from 2.0.1 to 2.0.2 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.0.1...v2.0.2)

---
updated-dependencies:
- dependency-name: tom-select
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 09:56:35 +00:00
Transifex-Openfoodnetwork
87ec803fba Updating translations for config/locales/en_GB.yml v4.1.29 2022-05-09 18:37:33 +10:00
Transifex-Openfoodnetwork
37a9338d0c Updating translations for config/locales/nb.yml 2022-05-09 17:59:00 +10:00
Transifex-Openfoodnetwork
3eccb65407 Updating translations for config/locales/en_FR.yml 2022-05-09 17:50:50 +10:00
Transifex-Openfoodnetwork
c1864fb8e5 Updating translations for config/locales/fr.yml 2022-05-09 17:50:43 +10:00
Maikel
44965ff235 Fix MAPI conditional on master 2022-05-09 12:35:52 +10:00
Maikel
e59d753333 Merge pull request #9044 from georgethoppil/optional-restock-items 
Optional restock items
 2022-05-09 09:08:26 +10:00
GeorgeThoppil
8903496a1b Optional restocking items 2022-05-06 10:55:24 -04:00
Jean-Baptiste Bellet
edc0520ce3 Update all locales with the latest Transifex translations 2022-05-06 09:51:36 +02:00
jibees
bf5e7a12d1 Merge pull request #9142 from openfoodfoundation/transifex 
Transifex
 2022-05-06 09:48:47 +02:00
Filipe
fb834d3143 Merge pull request #9138 from jibees/9137-order-shipping-methods-alphabetically 
Split checkout: Order shipping methods by name
 2022-05-05 12:41:12 +01:00
Filipe
24acf21c6d Merge pull request #9139 from jibees/6139-handle-shipping-method-description-with-no-space 
Split Checkout: Handle shipping/payment method description with no space
 2022-05-05 11:21:13 +01:00
Maikel Linke
ec7d7b0ad8 Fix workflow conditional 2022-05-05 14:22:39 +10:00
Maikel
ae728caac6 Merge pull request #9156 from mkllnk/mapi-condition 
Run Mayhem4API CI check only within organisation
 2022-05-05 14:01:51 +10:00
Maikel Linke
2758f83a2a Run Mayhem4API only within organisation 
The API key is not accessible outside.
 2022-05-05 12:10:08 +10:00
Transifex-Openfoodnetwork
5162c5ecf9 Updating translations for config/locales/en_GB.yml 2022-05-03 20:19:09 +10:00
Maikel
5ff1c1c7c2 Merge pull request #9136 from mayhemheroes/mapi 
add Mayhem for API as a github workflow
 2022-05-03 16:00:26 +10:00
Filipe
664e2a5423 Merge pull request #9057 from jibees/9038-handle-payment-errors-on-split-checkout 
Split checkout: handle cards that throws any errors
 2022-05-02 12:20:02 +01:00
Transifex-Openfoodnetwork
183a6f8fc7 Updating translations for config/locales/nb.yml 2022-04-29 19:14:57 +10:00
Jean-Baptiste Bellet
132ab28070 Handle very long description without any space for shipping and ... 
... payment methods
 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
89aa76dbbc Handle long payment description with no space 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
4635e67707 Create mixins to force wrap 
No need to pre-wrap since we break-word
 2022-04-29 10:15:50 +02:00
Transifex-Openfoodnetwork
8945142149 Updating translations for config/locales/en_FR.yml 2022-04-29 17:58:47 +10:00
Transifex-Openfoodnetwork
7cb6afbd96 Updating translations for config/locales/fr.yml 2022-04-29 17:49:58 +10:00
Maikel Linke
30ea017fa2 Update translations v4.1.28 2022-04-29 10:23:58 +10:00
Maikel
126a6aa84a Merge pull request #9114 from openfoodfoundation/fix-docker-setup 
Fix Docker setup to ease entry for new contributors
 2022-04-29 10:18:56 +10:00
Maikel
e2eb92fd90 Merge pull request #9119 from mkllnk/active-storage-part1 
Store files with Active Storage in addition to Paperclip
 2022-04-29 10:10:36 +10:00
J. David Lowe
ff1b895286 switch to openfoodfoundation 2022-04-28 14:42:24 -07:00
J. David Lowe
da2e7b404f add Mayhem for API as a github workflow 2022-04-28 13:30:34 -07:00