raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
95f2f92cf3 Extracted cookies footer links from view to footer links helper 2018-09-17 16:05:38 +01:00
luisramos0
bded530137 Moved web api endpoint from /api to /web/api 2018-09-17 16:05:38 +01:00
luisramos0
dc5eb6448e Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css 2018-09-17 16:05:38 +01:00
luisramos0
d170a4d489 New domain Web (rails engine) with the following features extracted from the main app: 
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
 2018-09-17 16:05:32 +01:00
Matt-Yorkley
e577bcb46f Prepare angular controller and serialized data 2018-09-17 14:18:23 +01:00
Pau Pérez Fabregat
0f627cdf39 Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle 
Translate "COPY OF" when cloning an OC
 2018-09-17 12:38:29 +02:00
Pau Pérez Fabregat
0520f2187c Merge pull request #2540 from luisramos0/delete_dead_store 
removed assets related to spree store: dead code
 2018-09-17 11:33:56 +02:00
Kristina Lim
798a6ed391 Translate more text in OC filters 2018-09-17 10:09:17 +10:00
luisramos0
843cd44b23 In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments 2018-09-17 00:51:01 +01:00
luisramos0
c66b611b99 Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec 2018-09-17 00:51:01 +01:00
luisramos0
75656668cd Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments 2018-09-17 00:51:01 +01:00
luisramos0
38c2f52278 In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments 2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05 Moved shipment and shipping_method factories with flat rate and shipping fees to traits 2018-09-17 00:51:01 +01:00
luisramos0
7b6e4825e7 Fixed controllers/spree/admin/orders/customer_details_controller_spec: 
- fixed order creation to use order.shipments instead of order.shipping_method
- adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4)
 2018-09-17 00:44:14 +01:00
luisramos0
93ac99b5cc Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec 2018-09-17 00:44:14 +01:00
Maikel Linke
ac85b90315 Clarify private class method declaration 2018-09-15 10:18:54 +10:00
luisramos0
8e5f43ed25 Fixed current order serializer spec name 2018-09-14 23:12:00 +01:00
luisramos0
238d2f4feb Removed unnecessary code copied and replaced with call to identical super class 2018-09-14 22:20:21 +01:00
luisramos0
5b3a529487 Adapted address_finder_spec to spree 2 shipments 2018-09-14 18:41:59 +01:00
luisramos0
d685b706ad In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists 2018-09-14 17:13:20 +01:00
luisramos0
2da7cc00f8 Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method 2018-09-14 16:43:20 +01:00
luisramos0
6b3fd22db8 Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment 2018-09-14 16:40:59 +01:00
Maikel
ce7be68fac Merge pull request #2660 from kristinalim/translations-failed_oc_creation 
Translate and fix fallback errors when creating or updating OC
 2018-09-14 16:58:39 +10:00
dependabot[bot]
05225aaba7 [Security] Bump uglifier from 2.7.1 to 4.1.19 
Bumps [uglifier](https://github.com/lautis/uglifier) from 2.7.1 to 4.1.19. **This update includes security fixes.**
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v2.7.1...v4.1.19)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-14 06:29:22 +00:00
Maikel
c3f461ad6e Merge pull request #2622 from openfoodfoundation/dependabot/bundler/db2fog-0.9.0 
Bump db2fog from 0.8.0 to 0.9.0
 2018-09-14 16:26:54 +10:00
Maikel
e836ac0234 Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link 
Enable setting a customized user guide link in general settings
 2018-09-14 15:46:05 +10:00
Maikel
beedd933e9 Merge pull request #2512 from kristinalim/feature-remove_enterprise_images 
Support removal of enterprise logo and promo image
 2018-09-14 15:07:24 +10:00
Maikel
eabb9f4574 Merge pull request #2659 from kristinalim/translations-admin_area_fixes 
Simple translation fixes for admin area and profile page
 2018-09-14 14:38:25 +10:00
Maikel
da2f278060 Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header 
Fix i18n translation for Store link in admin header for `fr`
 2018-09-14 14:24:29 +10:00
Maikel
43a3ecff06 Merge pull request #2612 from openfoodfoundation/dependabot/bundler/jwt-1.5.6 
Bump jwt from 1.5.4 to 1.5.6
 2018-09-14 14:13:02 +10:00
Maikel
514f64c8d0 Merge pull request #2650 from kristinalim/translations-more_admin_header 
Add "more" translation key
 2018-09-14 13:31:13 +10:00
Maikel
6b56def649 Merge pull request #2697 from mkllnk/2655-fix-admin-payments 
2655 fix admin payments
 2018-09-14 11:26:20 +10:00
Maikel
1000bd4d24 Merge pull request #2658 from kristinalim/translations-order_and_shipment_emails 
Allow fixing and customizing translations for order cancellation and shipment emails
 2018-09-14 10:11:56 +10:00
Hugo Daniel
8dd0e01b8e Use explicit syntax for section objects in preference_sections definition 2018-09-13 12:34:06 +02:00
Pau Pérez Fabregat
692101db36 Merge pull request #2691 from coopdevs/fix-variant-override-spec 
Fix failing spec due to wrong attribute
 2018-09-13 12:21:35 +02:00
Maikel Linke
ec953e1db0 Style cache refreshment class 2018-09-13 17:22:01 +10:00
Maikel Linke
2e635f94f6 Make job queuing more robust and efficient 2018-09-13 17:20:11 +10:00
dependabot[bot]
b676bfdcc8 Bump jwt from 1.5.4 to 1.5.6 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 1.5.4 to 1.5.6.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v1.5.4...v1.5.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-13 02:34:11 +00:00
Maikel
065df96872 Merge pull request #2675 from Matt-Yorkley/bi/remake_views 
Remake orders index view
 2018-09-13 12:29:54 +10:00
Maikel
5e722bf57d Merge pull request #2634 from luisramos0/cookies_matomo_optout 
[Cookies] Adds matomo optout iframe to cookies policy page
 2018-09-13 12:29:09 +10:00
Maikel
f46c1e8414 Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer 
Replace therubyracer with mini_racer
 2018-09-13 12:28:03 +10:00
Maikel Linke
81f60aab46 Make PaymentMethod serialisable with fees 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
 2018-09-13 12:01:17 +10:00
Maikel Linke
d7b19750e5 Add spec for GH issue #2655 2018-09-13 12:01:16 +10:00
Maikel Linke
a447fe4f40 Require lib file where needed 
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.

I just ran into this problem in my dev environment.
 2018-09-13 12:01:16 +10:00
luisramos0
478dd68072 In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case 2018-09-12 18:30:24 +01:00
luisramos0
409f084bd4 Added matomo opt out iframe to cookies policy page 2018-09-12 18:30:24 +01:00
Pau Perez
ce148e0197 Fix failing spec due to wrong attribute 2018-09-12 18:19:08 +02:00
Pau Pérez Fabregat
3f5c799166 Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page 
Fix ask anonymous users to login for order page
 2018-09-12 16:17:34 +02:00
Hugo Daniel
cc43d789e2 Refacto edit method for content controller and enable custom user guide link 2018-09-12 14:51:53 +02:00
dependabot[bot]
91c0de3f2a Bump db2fog from 0.8.0 to 0.9.0 
Bumps [db2fog](https://github.com/itbeaver/db2fog) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/itbeaver/db2fog/releases)
- [Changelog](https://github.com/itbeaver/db2fog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/itbeaver/db2fog/commits/v0.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-12 11:09:57 +00:00