raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,396 Commits 17 Branches 453 Tags
17e77df14f53bc0767a35aa20b973e80ced94bb9
Commit Graph

15396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Pérez Fabregat
17e77df14f Merge pull request #5451 from Matt-Yorkley/oc-selector-fix 
Fix tab-buttons element overlapping order cycle selector
 2020-05-22 18:39:10 +02:00
Pau Pérez Fabregat
3f593d6246 Merge pull request #5440 from luisramos0/grumpy_cat 
Fix Grumpy Cat on shop page (cart with items from a closed OC)
 2020-05-22 18:38:41 +02:00
Pau Pérez Fabregat
72399cb6df Merge pull request #5485 from luisramos0/byeby_phantom_js 
Rename method refering to phantomjs
 2020-05-22 18:37:28 +02:00
Pau Pérez Fabregat
b804036822 Merge pull request #5469 from openfoodfoundation/transifex 
Transifex
 2020-05-22 18:24:14 +02:00
Transifex-Openfoodnetwork
88ab5c2dd7 Updating translations for config/locales/fr.yml 2020-05-22 23:31:48 +10:00
Transifex-Openfoodnetwork
466bbe52ae Updating translations for config/locales/en_FR.yml 2020-05-22 23:29:08 +10:00
Luis Ramos
9a71ffc093 Merge pull request #5438 from Matt-Yorkley/cart-stock-ux 
Cart stock UX
 2020-05-22 14:21:16 +01:00
Luis Ramos
b7c601abcd Merge pull request #5424 from luisramos0/ship_method_warning 
Add warning to enterprise Shipping Method list and to Shipping method edit page
 2020-05-22 11:24:12 +01:00
Luis Ramos
639c1e1ccc Rename method, it's not phantomjs running underneath any more 2020-05-22 10:57:51 +01:00
Luis Ramos
6fcca0197c Merge pull request #5450 from rmklaus12/5095-ordercycle-amtqty-translations 
Changed report_header fields for amount and quantity to reflect corre…
 2020-05-21 21:21:14 +01:00
Transifex-Openfoodnetwork
adb3c9e56f Updating translations for config/locales/en_NZ.yml 2020-05-22 00:22:33 +10:00
Pau Pérez Fabregat
c6c9dcc345 Merge pull request #5478 from luisramos0/bundler1-17-3 
Upgrade bundler, byebug and pry-byebug
 2020-05-21 16:10:38 +02:00
Luis Ramos
6e6dab8f72 Merge pull request #5474 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.5 
Bump activerecord-import from 1.0.4 to 1.0.5
 2020-05-21 13:17:51 +01:00
Luis Ramos
574e4a02c0 Force pry to 0.12 so that it works well with pry-byebug 3.7 2020-05-21 13:10:59 +01:00
Luis Ramos
01eda90a00 Upgrade bundler, byebug and pry-byebug 2020-05-21 12:59:57 +01:00
Pau Pérez Fabregat
6851921e9d Merge pull request #5443 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.14 
Bump mini_racer from 0.2.11 to 0.2.14
 2020-05-21 13:32:30 +02:00
Luis Ramos
8cdc9b82df Merge pull request #5427 from luisramos0/jquery-ui-rails 
Upgrade jquery-ui-rails to v4.2.1
 2020-05-21 10:57:10 +01:00
Luis Ramos
2ae34d8df3 Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page 
change shop name to be link to shop on transactions page
 2020-05-21 10:56:19 +01:00
Luis Ramos
35b249f40d Merge pull request #5390 from rmklaus12/fix-enyml-keys 
Fix translation keys in en.yml file from previous conflicting PRs
 2020-05-21 10:56:01 +01:00
Luis Ramos
a6ea79d3a5 Add warning message to enterprise ship methods list and ship method edit page 2020-05-21 10:47:22 +01:00
Luis Ramos
d017c0b701 Change base translation from applies to active so the naming is consistent: ship methods can be active or inactive for an enterprises which means they can be linked or not to that enterprise 2020-05-21 10:45:58 +01:00
Luis Ramos
cf0ad179a1 Move hubs_sidebar to the last 4 columns at the top of the page 2020-05-21 10:45:58 +01:00
Transifex-Openfoodnetwork
8bb47ef467 Updating translations for config/locales/en_NZ.yml 2020-05-21 16:43:58 +10:00
Maikel
da55956a6e Merge pull request #5392 from luisramos0/ship_method_bo 
Make "backoffice only" ship methods work and remove option "frontoffice only"
 2020-05-21 10:16:15 +10:00
dependabot-preview[bot]
0e1ae03454 Bump activerecord-import from 1.0.4 to 1.0.5 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.4...v1.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-20 20:02:29 +00:00
Luis Ramos
e287680c1b Merge pull request #5429 from mkllnk/5400-orders-distributors-report 
5400 List each order only once in Orders And Distributors report
 2020-05-20 20:36:58 +01:00
Matt-Yorkley
6b3a7228ce Update flash message with instruction to update the quantities 2020-05-20 09:43:29 +02:00
Transifex-Openfoodnetwork
8387c71b6e Updating translations for config/locales/tr.yml 2020-05-20 15:55:52 +10:00
Luis Ramos
76b721b663 Merge pull request #5457 from Matt-Yorkley/cart-fix 
Fix cart fields sharing same scope
 2020-05-19 19:31:49 +01:00
Matt-Yorkley
05e6f5792d Fix cart fields sharing same scope 
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
 2020-05-19 10:23:12 +02:00
Matt-Yorkley
e54fad9bfd Add spec for maximum quantities with multiple items in cart 
This currently fails
 2020-05-19 10:21:24 +02:00
Maikel Linke
2d95e9ebc0 List each order only once in report 2020-05-19 10:38:28 +10:00
Maikel Linke
19f7f04816 Add spec for report bug 2020-05-19 10:38:28 +10:00
Maikel Linke
359fd1ac98 Improve readability of report spec 2020-05-19 10:38:28 +10:00
Matt-Yorkley
e3c337ef7e Fix mixed error display issue 2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc Use fresh scope for each quantity field 2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082 Move reused available stock logic to service 2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799 Update invalid input feedback 2020-05-18 16:14:14 +02:00
Matt-Yorkley
f7b4717f29 Improve validation code 2020-05-18 14:51:11 +02:00
Matt-Yorkley
fe27c8466e Add feature specs for full cart page stock correction process 2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4 Update cart page links to be disabled when changes are required and form is unsaved 
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
 2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432 Fix tab-buttons element overlapping order cycle selector 2020-05-18 14:27:05 +02:00
Matt-Yorkley
3a46f32aa3 Merge pull request #5435 from openfoodfoundation/transifex 
Transifex
 2020-05-18 13:44:32 +02:00
Luis Ramos
ea8157a5c6 Merge pull request #5304 from dacook/5299-orders-filter-several-tags 
5299 Impossible to filter orders with several tags
 2020-05-18 11:25:54 +01:00
Luis Ramos
37350fcbb0 Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query 2020-05-18 10:55:03 +01:00
Luis Ramos
05136b51d1 Merge pull request #5356 from rmklaus12/4534-mobile-searchkey 
Changed search input to inputmode to enable 'go' button on dynamic mo…
 2020-05-18 10:30:56 +01:00
Robin Klaus
311bbd2aa2 Changed report_header fields for amount and quantity to reflect correct translation to French 2020-05-18 18:41:04 +10:00
Transifex-Openfoodnetwork
d2b8b5e888 Updating translations for config/locales/pt_BR.yml 2020-05-18 05:14:19 +10:00
Robin Klaus
438c0ecde9 delete extra lines 2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac Added input code to two additional pages to cover shop tab search boxes 2020-05-16 12:56:06 +10:00