Commit Graph

  • 288f685fd4 Merge pull request #2654 from luisramos0/2-0-ship-method Pau Pérez Fabregat 2018-09-11 08:27:36 +02:00
  • c00e6a5dc7 Added DB uniqueness constraint on order_id to shipments luisramos0 2018-09-10 17:02:50 +01:00
  • 3577f3790d Moved order.shipping_method to the OrderShippingMethod concern luisramos0 2018-09-10 16:50:34 +01:00
  • 62951f7d48 Removing duplicated factories inserted by previous PRs: 2668 and 2670 luisramos0 2018-09-10 15:16:19 +01:00
  • f24b20d28c Added adapted implementation of order.shipping_method to order_decorator luisramos0 2018-09-06 22:45:22 +01:00
  • 8d8670bdf4 Fix typos in comments Pau Perez 2018-09-10 14:26:19 +02:00
  • cde2f98514 Merge pull request #2590 from luisramos0/spree2_mail_method_create Pau Pérez Fabregat 2018-09-10 12:08:23 +02:00
  • a906ad15bd Merge pull request #2670 from luisramos0/2-0-ship-method-adjustment-spec Pau Pérez Fabregat 2018-09-10 11:32:54 +02:00
  • 44d81622ac CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly luisramos0 2018-08-25 19:20:59 +01:00
  • 5a11af9118 Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec Pau Pérez Fabregat 2018-09-10 11:18:10 +02:00
  • bce2c1cfd5 Merge pull request #2588 from luisramos0/spree2_mail_method_specs Maikel 2018-09-10 11:28:34 +10:00
  • 2f1616a286 Changed reference from order.shipping_method to order.shipments in adjustment_spec luisramos0 2018-09-09 23:24:19 +01:00
  • 5bcc49a61c Removed calls to the now inexistent order.create_shipment! from specs luisramos0 2018-09-07 11:56:26 +01:00
  • 73512d3591 Replaced order.shipping_method with order.shipments in models.order_spec. luisramos0 2018-09-08 20:27:18 +01:00
  • afedbe45ab Fixed scenario "guest order with registered email" in order_spec luisramos0 2018-09-07 12:02:19 +01:00
  • d6cff9bc68 Removed calls to the now inexistent order.create_shipment! from specs luisramos0 2018-09-07 11:56:26 +01:00
  • 02a909c1b1 Do not use image_tag for enterprise image previews Kristina Lim 2018-09-08 23:10:06 +08:00
  • 5e0997d03e Merge pull request #2635 from apoc64/timezone_comments Maikel 2018-09-08 15:55:16 +10:00
  • ce7c7b3867 Merge pull request #2640 from luisramos0/2-0-stable-spree-revision Maikel 2018-09-08 15:00:50 +10:00
  • 003e65fbed Translate error when failing to create order cycle Kristina Lim 2018-09-08 00:33:49 +08:00
  • 2c2dd62f6a Translate "COPY OF" when cloning an OC Kristina Lim 2018-09-08 02:06:52 +08:00
  • 9dcdb67352 Translate inherits_properties label in product form Kristina Lim 2018-09-08 01:37:51 +08:00
  • fc79aae17c Translate authorized shops headers in account page Kristina Lim 2018-09-07 18:18:34 +08:00
  • c64acf47ab Fix translation key for "involving" in OC filters Kristina Lim 2018-09-07 18:08:20 +08:00
  • 86f4a118dd Translate placeholder for order cycle name filter Kristina Lim 2018-09-07 17:58:34 +08:00
  • 40443b19f1 Add translations for headers in enterprise index Kristina Lim 2018-09-07 17:50:27 +08:00
  • 2cf608ffdf Add translations for shipment emails Kristina Lim 2018-09-07 17:08:03 +08:00
  • f1d5088aaa Add translations for order cancellation emails Kristina Lim 2018-09-07 17:01:43 +08:00
  • 62f5228f1f Merge pull request #2643 from luisramos0/transifex_manual v1.19.0 Maikel 2018-09-07 16:46:24 +10:00
  • 3e0c74494d Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug Maikel 2018-09-07 15:10:18 +10:00
  • d6c2a36451 Blacklist libv8 version that breaks mini_racer Maikel Linke 2018-09-07 13:50:38 +10:00
  • b9fe1ced16 Replace therubyracer with mini_racer Frank West 2018-07-03 13:39:59 -07:00
  • 937da277f7 Merge pull request #2628 from openfoodfoundation/dependabot/bundler/rubyzip-1.2.2 Maikel 2018-09-07 10:51:41 +10:00
  • d2f4f8ccb2 Removed unused shipping_method.within_zone, customization not needed luisramos0 2018-09-06 20:28:46 +01:00
  • d06bccb832 Change i18n key for Store link in admin header Kristina Lim 2018-09-06 17:14:23 +08:00
  • cd53ec1a4f Replace exception with DB uniqueness constraint Pau Perez 2018-09-06 13:16:20 +02:00
  • 8848af15ee Raise when a variant has more than a stock item Pau Perez 2018-09-04 13:26:42 +02:00
  • 59883f9509 Add deprecation warnings for VariantStock methods Pau Perez 2018-09-03 18:06:53 +02:00
  • fc5882686a Add unit tests to VariantStock Pau Perez 2018-09-03 17:44:37 +02:00
  • 6d5f8553ef Add "more" translation key Kristina Lim 2018-09-06 18:08:42 +08:00
  • f9533f8fb8 Refactor redirecting back after requiring login Kristina Lim 2018-09-06 15:14:41 +08:00
  • cd41498da9 Ask to login when not authenticated for order page Kristina Lim 2018-09-02 04:03:42 +08:00
  • 3bf9e95511 Add specs for existing behaviour in order page Kristina Lim 2018-09-02 03:06:30 +08:00
  • 28d2bb3d47 Wrap controller specs for viewing cart Kristina Lim 2018-09-01 20:36:22 +08:00
  • 417c33a870 Merge pull request #2639 from luisramos0/2-0-stable-sept Maikel 2018-09-06 08:50:47 +10:00
  • 339ea6fa91 Clean up SCSS as suggested by scss-lint Kristina Lim 2018-08-27 03:25:09 +08:00
  • 9258e8c464 Remove height limit for modals in small screens Kristina Lim 2018-08-26 22:22:40 +08:00
  • 169aa752d8 Enlarge potential size of modals for large screens Kristina Lim 2018-08-26 22:01:24 +08:00
  • f4725198e8 Move some CSS to pages/ subdirectory. Kristina Lim 2018-08-20 03:20:24 +08:00
  • f03eb02269 Keep height of modal, dialog within screen height Kristina Lim 2018-08-16 00:19:36 +08:00
  • a37e9f1b87 Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation Kristina Lim 2018-08-15 19:26:28 +08:00
  • 34adf7cf6c Lower the start point for sliding of modals Kristina Lim 2018-08-15 03:07:14 +08:00
  • 6e55e5b1c7 Use maximum of 80% for modals in large screens Kristina Lim 2018-08-15 03:03:03 +08:00
  • 138fa41b8d Fetched latest translations from transifex with tx pull --force luisramos0 2018-09-04 20:03:55 +01:00
  • 0a05e6944e Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise Pau Pérez Fabregat 2018-09-05 13:23:02 +02:00
  • b23cb55525 Fix current violations of Style/Send cop Pau Perez 2018-08-31 12:10:52 +02:00
  • 89d51d75ae Merge branch 'master' into 2-0-stable-sept luisramos0 2018-09-04 17:33:52 +01:00
  • 0d2fa3dc40 Merge pull request #2611 from luisramos0/cookies_banner_font_size Maikel 2018-09-04 11:35:32 +10:00
  • 1b6bb72966 Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug Maikel 2018-09-04 11:29:51 +10:00
  • d29a1ebf9a Updated spree 2-0-4 revision used luisramos0 2018-09-04 00:41:29 +01:00
  • ce0758d420 Add confirm dialog for enterprise image removal Kristina Lim 2018-07-30 08:39:37 +08:00
  • 368612cad6 Allow removal of enterprise logo and promo image Kristina Lim 2018-07-30 07:42:51 +08:00
  • c9370672c6 Add JS support for removal of enterprise images Kristina Lim 2018-07-28 23:44:28 +08:00
  • 9c3bb863da Add endpoints for removing enterprise images Kristina Lim 2018-07-12 11:43:10 +08:00
  • 01d4b8fb10 Allow custom resource permission for admin controllers Kristina Lim 2018-08-26 03:41:54 +08:00
  • f30032eee7 Include image URLs in serialized enterprise for admin Kristina Lim 2018-07-29 15:51:24 +08:00
  • 8efbe0e6d2 Delete _split2.css from application.rb assets precompile array. VadLusk 2018-09-03 11:08:38 -06:00
  • 7dbbc3e9d8 Merge pull request #2610 from luisramos0/cookies_banner_bug Pau Pérez Fabregat 2018-09-03 17:23:17 +02:00
  • fbce828305 Breaks comment into multiple lines apoc64 2018-09-03 08:56:42 -06:00
  • 903d70090e Merge pull request #2636 from luisramos0/heroku_dead_code Pau Pérez Fabregat 2018-09-03 12:49:19 +02:00
  • 0f118baa4e Merge pull request #2615 from mkllnk/2575-variant-on-hand-api Pau Pérez Fabregat 2018-09-03 11:16:02 +02:00
  • 8004abbb9f Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method luisramos0 2018-08-31 19:42:30 +01:00
  • 921c8dfdf4 Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code. luisramos0 2018-08-31 19:41:30 +01:00
  • 14d526efc2 removed assets related to spree store: dead code luisramos0 2018-08-11 23:31:27 +01:00
  • 129e2c915e Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0 Maikel 2018-09-03 14:39:21 +10:00
  • 1b264403e0 Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user Maikel 2018-09-03 14:38:56 +10:00
  • 3fadd06dc7 Merge pull request #2613 from luisramos0/cookies_better_policy_page Maikel 2018-09-03 11:49:14 +10:00
  • 42afd426d5 Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4 Maikel 2018-09-03 11:48:48 +10:00
  • 11ab875b9a Merge pull request #2623 from openfoodfoundation/dependabot/bundler/eventmachine-1.2.7 Maikel 2018-09-03 11:48:34 +10:00
  • c510bbd8d0 Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update Maikel 2018-09-03 11:05:48 +10:00
  • f74a6e47d5 Remove css_splitter references, delete all_split2.css. #1361 #2633 VadLusk 2018-09-03 09:20:26 +10:00
  • 512577768c Removed old files that were used with, now unsuported, heroku luisramos0 2018-09-02 22:13:42 +01:00
  • e62a755ddb Adds comments for setting up timezone in application.yml apoc64 2018-09-02 11:08:27 -06:00
  • 59f8dd4458 Improved cookies spec by keeping global config values as they were before the test luisramos0 2018-09-01 20:35:07 +01:00
  • f844236b9c Remove order link in non-user order cancellation email Kristina Lim 2018-08-30 03:18:42 +08:00
  • 5f2c3a1955 Remove order link in non-user failed payment email Kristina Lim 2018-08-30 03:14:41 +08:00
  • f8244a400a Custom subscription placement email if non-user Kristina Lim 2018-08-30 03:02:42 +08:00
  • ad8b120e48 Extract format for order cycle closing in emails Kristina Lim 2018-08-30 02:58:02 +08:00
  • 9d05e5c97a Remove duplicate line in spec Matt-Yorkley 2018-09-01 14:09:07 +01:00
  • dc4037474d Test order links in subscription placement emails Kristina Lim 2018-08-30 02:48:06 +08:00
  • d8bbcdc54b Decrease batch size to reduce chance of timeouts Matt-Yorkley 2018-08-31 22:52:44 +01:00
  • 4dfbbd60d4 Fix occasional StaleObjectError on variant updates Matt-Yorkley 2018-08-31 19:13:17 +01:00
  • 4557bfbc17 [Security] Bump rubyzip from 1.2.1 to 1.2.2 dependabot[bot] 2018-08-31 17:49:12 +00:00
  • 75a9ea5bfa Prefer .flat_map(&foo) over .map(&foo).flatten Matt-Yorkley 2018-08-31 15:38:38 +01:00
  • 04d50d4555 Fix filter results bug in validation section Matt-Yorkley 2018-08-31 15:00:29 +01:00
  • f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" Kristina Lim 2018-08-31 15:15:50 +08:00
  • a9c8c033c7 Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6 Maikel 2018-08-31 14:54:53 +10:00
  • c30e29051a Merge pull request #2594 from openfoodfoundation/dependabot/bundler/compass-rails-3.1.0 Maikel 2018-08-31 13:47:22 +10:00
  • 42936be40a Merge pull request #2578 from luisramos0/spree2_fix_test_line_items Maikel 2018-08-31 13:26:25 +10:00
  • 13b9ecab21 Fix font issue in mobile menu Maikel Linke 2018-08-31 11:22:50 +10:00