Commit Graph

  • edde929ced Replace uses of #stub with #allow in Admin::CustomersController Rob Harrington 2018-05-11 14:42:01 +10:00
  • 4863f2b5b4 Remove unrequired credit_card_id field from subscriptions table Rob Harrington 2018-05-10 18:45:07 +10:00
  • 21c3f7d21c Remove unrequired #cards and #addresses actions from Admin::CustomerController Rob Harrington 2018-05-10 18:35:41 +10:00
  • e0d46aa105 Add new serializer to allow search for customer addresses Rob Harrington 2018-05-10 13:08:03 +10:00
  • c71a5ec0df Update subscription form to use new card validations for Stripe payment method Rob Harrington 2018-05-09 11:39:56 +10:00
  • a03dd1e10c Serialize default card auth and presence for Customers Rob Harrington 2018-05-09 11:37:23 +10:00
  • 21c24eb69b Validate presence and auth of default card for customer Rob Harrington 2018-05-09 11:35:13 +10:00
  • cf8ca1f8c1 Add show action to Admin::CustomersController Rob Harrington 2018-05-04 12:06:03 +10:00
  • 45895e9924 Use the user's default card to pay for subcriptions Rob Harrington 2018-05-04 11:39:26 +10:00
  • fc2844a3d5 Add default_card method to user model Rob Harrington 2018-05-04 11:38:35 +10:00
  • c7f7e420ea Skip shipment creation for payment step Maikel Linke 2018-07-05 16:34:11 +10:00
  • 09534b41e9 Remove taxon when primary taxon is changed Frank West 2018-06-15 11:07:39 -07:00
  • 82e3016a26 Add comment to StripeGateway wrapper methods indicating that they are named by Spree Rob Harrington 2018-06-07 15:56:38 +10:00
  • 2da6234362 Add spec for StripeGateway#refund Rob Harrington 2018-06-07 15:50:28 +10:00
  • c496d0f14d Allow credit owed on payments made via stripe to be refunded via the admin section Rob Harrington 2018-05-10 17:49:13 +10:00
  • 108c4a7abb Add GETTING_STARTED.md and update README.md Rob Harrington 2018-06-22 21:31:47 +10:00
  • 687612dba8 Merge pull request #2403 from luisramos0/hide-stripe-postcode Maikel 2018-06-28 08:55:42 +10:00
  • b7de80dd7f Remove unused count_on_hand setting from spec Maikel Linke 2018-06-27 11:41:55 +10:00
  • 306bfa1944 Remove unused method enterprise method Maikel Linke 2018-06-27 11:25:44 +10:00
  • 792701297b Remove unused scope Enterprise.active_distributors Maikel Linke 2018-06-27 11:12:54 +10:00
  • eb9064f5be Merge pull request #2383 from frank-west-iii/issue-2271-prepend-load Maikel 2018-06-27 09:12:18 +10:00
  • f5346289c7 Merge pull request #2388 from Matt-Yorkley/uk/pi_available_on Maikel 2018-06-26 17:58:39 +10:00
  • 3f334855d1 Merge pull request #2360 from oeoeaio/faster-stats Maikel 2018-06-26 17:58:23 +10:00
  • e9fad741e6 Merge pull request #2387 from Matt-Yorkley/embedded_referrers Maikel 2018-06-26 17:57:48 +10:00
  • ddb9ae1140 Load all shops that a user is associated with as a customer Rob Harrington 2018-06-22 15:34:17 +10:00
  • 7707df354b Merge branch 'master' into 2-0-stable Pau Perez 2018-06-22 13:23:18 +02:00
  • 0d9b03b066 Hide postcode - not necessary as passed from billing address and wrecks mobile UX luisramos0 2018-06-22 11:42:50 +01:00
  • 5e6291bce3 Don't request customers if list is already populated Rob Harrington 2018-06-22 15:31:32 +10:00
  • d1d9c5a092 Add help button to saved cards list on account page Rob Harrington 2018-06-22 14:12:41 +10:00
  • 7db7084008 Use help-modal to display help text for authorised shops Rob Harrington 2018-06-22 14:05:05 +10:00
  • 32622c77bc Add basic help modal directive Rob Harrington 2018-06-22 13:57:21 +10:00
  • 6457a17fde Add basic view allowing customers to authorise shop use of their credit cards Rob Harrington 2018-04-27 17:42:34 +10:00
  • ffa8a8c7d6 Create Api::BaseController to allow use of ActiveModelSerializers Rob Harrington 2018-04-27 16:04:58 +10:00
  • 29922d4be9 Add allow_charges field to Customer model Rob Harrington 2018-04-11 09:54:43 +10:00
  • 6e76fd8164 Add Api::CustomersController with update action Rob Harrington 2018-04-20 11:27:33 +10:00
  • e25574790b Split out float: right css from .help-btn.tiny selector Rob Harrington 2018-04-06 14:55:21 +10:00
  • bd7e072938 embedded groups layout changes Keir Osborn 2018-02-13 10:44:03 +00:00
  • f626a21c5e embedded groups initial test Keir Osborn 2017-12-22 11:29:12 +00:00
  • 964059f25b Merge remote-tracking branch 'origin/master' into HEAD Buildkite 2018-06-22 02:41:15 +00:00
  • 57dbf2e770 Merge remote-tracking branch 'origin/master' into HEAD Buildkite 2018-06-22 00:59:28 +00:00
  • cf9f8edcce Allow html requests for OrderCycleController#update Rob Harrington 2018-06-13 14:56:35 +10:00
  • 25525ae30b Move applicator calls to OrderCycleForm Rob Harrington 2018-03-09 12:01:01 +11:00
  • f88f4a5791 Refactor OrderCycleForm to make logic clearer Rob Harrington 2018-03-08 17:23:17 +11:00
  • d9830749f1 Extract schedule syncing logic into OrderCycleForm Rob Harrington 2018-03-08 16:21:31 +11:00
  • 21bd9d2e10 Add basic specs for OrderCyclesController#create Rob Harrington 2018-03-09 13:48:36 +11:00
  • ab9c06837b Add basic OrderCycleForm to handle create/update logic Rob Harrington 2018-03-08 16:12:45 +11:00
  • 3f5b6be5b6 Remove unnecessary respond_to blocks from OrderCyclesController Rob Harrington 2018-03-08 15:30:24 +11:00
  • 172fa168ea Change layout attribute to method with question mark Matt-Yorkley 2018-06-21 14:18:32 +01:00
  • aaba6da162 Add available_on notes to PI guide Matt-Yorkley 2018-06-16 14:30:17 +01:00
  • d9623176fb Include admin users as managers on new enterprises Matt-Yorkley 2018-06-14 13:33:06 +01:00
  • d510df5236 Remove obsolete goWithoutHashFragments Maikel Linke 2018-06-15 10:49:53 +10:00
  • fb02bdd25a Simplify Navigation.go, not preserving hash fragments Maikel Linke 2018-06-15 09:51:43 +10:00
  • 6cf09c936b Merge pull request #2345 from luisramos0/do-not-upcase-state Pau Pérez Fabregat 2018-06-20 21:30:10 +02:00
  • 6e81871459 Specs for new EmbeddedPageService Matt-Yorkley 2018-06-20 15:14:56 +01:00
  • 3399eba428 Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel Maikel 2018-06-20 17:53:57 +10:00
  • a29a1bd047 Only show change warning for open order cycles Rob Harrington 2018-06-20 15:11:30 +10:00
  • 7af11da901 Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer Rob Harrington 2018-06-13 17:00:46 +10:00
  • d5b1041481 Preload subscription counts for serialization in order cycle collection actions Rob Harrington 2018-06-08 16:50:41 +10:00
  • 8770122eae Request the subscription count for change warning each time, don't cache Rob Harrington 2018-04-11 15:30:33 +10:00
  • 86d7453d26 Ask user to confirm oc date change for open order cycles with subsciptions Rob Harrington 2018-03-14 15:23:36 +11:00
  • bbe21b7804 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel Maikel Linke 2018-06-20 10:31:17 +10:00
  • ff0e0d9f3d Move logic from ApplicationController to service and improve clarity Matt-Yorkley 2018-06-16 02:49:22 +01:00
  • e73b378201 Adjust embedded response headers Matt-Yorkley 2018-06-15 21:50:44 +01:00
  • b8f1571282 added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages luisramos0 2018-06-15 17:34:44 +01:00
  • 8da8a5a086 Merge pull request #2392 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-06-19 13:37:38 +02:00
  • 20c25cd030 Merge pull request #2368 from Matt-Yorkley/uk/admin_orders Pau Pérez Fabregat 2018-06-19 11:00:35 +02:00
  • 3821b9e0da Fix ordering of Gemfile.lock Frank West 2018-06-15 06:27:02 -07:00
  • f7848b025f Add rack-rewrite to handle redirects Frank West 2018-06-08 08:38:39 -07:00
  • 8324b00999 Renames product bulk edit action to index Frank West 2018-06-08 07:55:39 -07:00
  • 3484996dbd Merge pull request #2335 from luisramos0/issue2334 Pau Pérez Fabregat 2018-06-19 09:34:13 +02:00
  • 236920d28f Merge pull request #2357 from luisramos0/enterprises_country_state Pau Pérez Fabregat 2018-06-19 09:30:24 +02:00
  • b1bccb07f2 Merge pull request #2369 from coopdevs/product-import-for-superadmins-only Pau Pérez Fabregat 2018-06-19 09:23:58 +02:00
  • 55e619af8d Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-06-19 10:59:37 +10:00
  • dabef16606 Use ofn-select2 directive for country and state selectors on enterprise forms Rob Harrington 2018-06-14 12:35:03 +10:00
  • d1019fcc5e changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed luisramos0 2018-06-12 15:40:56 +01:00
  • 2bfb635bcc Merge pull request #2341 from luisramos0/checkout_country_state Maikel 2018-06-19 09:34:21 +10:00
  • fe39d96e7f Updating translations for config/locales/fr_CA.yml Transifex-Openfoodnetwork 2018-06-19 05:48:59 +10:00
  • f2e1caabff Fix NoMethodError in order cycles index Frank West 2018-06-15 08:27:26 -07:00
  • f272a7b604 Merge pull request #2361 from mkllnk/2356-report-search-hint Maikel 2018-06-18 14:51:48 +10:00
  • ea9ea83fee improved checkout country and state selectors code luisramos0 2018-05-31 23:00:14 +01:00
  • 3cb0b76d21 fixed checkout tests by replacing state abbr with name in address selector boxes luisramos0 2018-05-31 00:39:36 +01:00
  • 836a5836d9 fixed country_state selectors on checkout luisramos0 2018-05-28 23:31:57 +01:00
  • b7770510a7 Use CSS for layout Maikel Linke 2018-06-06 17:57:37 +10:00
  • 67c2574b0b Show report search instructions Maikel Linke 2018-06-06 17:54:26 +10:00
  • 7a2218fe26 Style the reports controller Maikel Linke 2018-06-06 17:36:19 +10:00
  • 6243640bca Unify sales tax report rendering with others Maikel Linke 2018-06-06 16:33:53 +10:00
  • 66567fd9e6 Unify report table rendering Maikel Linke 2018-06-06 15:23:20 +10:00
  • 86ff24b43c Merge pull request #2386 from frank-west-iii/fix-ssl-errors-specs Maikel 2018-06-18 08:45:31 +10:00
  • 0d7352813c Set the SSL protocol for secure connections Frank West 2018-06-15 11:41:22 -07:00
  • 61f303ced2 Merge pull request #2373 from oeoeaio/fix-import-date-filter Rob H 2018-06-15 16:53:22 +10:00
  • d0f8e9fba6 Reimplement import date filter as an actual Filter Rob Harrington 2018-06-13 10:48:16 +10:00
  • 46f5f5061a Merge pull request #2377 from mkllnk/2376-fix-paypal-redirects Maikel 2018-06-15 10:16:31 +10:00
  • 561a73e911 Pass on redirect path instead of URL Maikel Linke 2018-06-14 16:49:52 +10:00
  • 24c6b940f6 Merge pull request #2370 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-06-13 12:03:34 +02:00
  • d5310eed6c Merge pull request #2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined Pau Pérez Fabregat 2018-06-13 09:12:57 +02:00
  • c72a2fda91 Use placed_at state to determine whether to remove orphaned proxy orders Rob Harrington 2018-06-08 13:44:37 +10:00
  • d9ddad554e Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer Rob Harrington 2018-03-14 17:11:11 +11:00
  • ac309ffaf5 Rename obsolete_proxy_orders to orphaned_proxy_orders Rob Harrington 2018-03-14 16:27:21 +11:00
  • 51bbf64b10 Merge pull request #2363 from oeoeaio/update-contributors Maikel 2018-06-13 11:11:29 +10:00
  • 6e2966d7e8 Changed require syntax to fit jquery < 5.0 Hugo Daniel 2018-06-12 15:59:41 +02:00