raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 19 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

17514 Commits

Author SHA1 Message Date
stveep
0280e04008 Move OAuth2 patching to an initializer 2017-09-23 14:57:02 +10:00
Steve Pettitt
41607c5846 De-associate accounts in response to webhook (not tested with a real deauth request yet) 2017-09-23 14:57:02 +10:00
Steve Pettitt
05a69ff0c6 Worklow to disconnect Stripe from OFN admin interface 2017-09-23 14:57:02 +10:00
Steve Pettitt
758f57a889 Remove CSRF check - doesn't work properly as implemented, but connect request should probably be changed to POST 2017-09-23 14:57:02 +10:00
Steve Pettitt
eed11faa62 Monkey patching OAuth2 gem to include Stripe disconnection method 2017-09-23 14:57:02 +10:00
Steve Pettitt
7fd8c5956d Check CSRF, allow a Stripe account to be connected to more than one enterprise (but not vice versa) 2017-09-23 14:57:02 +10:00
Steve Pettitt
b6292e2723 Add some logic to check for a connected Stripe Account in form 2017-09-23 14:57:02 +10:00
Steve Pettitt
8bdf57d0d9 Add Stripe Connect button (CSS) in admin/enterprises/:id/edit#payment_methods 2017-09-23 14:57:02 +10:00
Steve Pettitt
03f590ccc4 Callback creates a new StripeAccount with id and publishable key. 2017-09-23 14:57:02 +10:00
Steve Pettitt
06279848c6 Stripe auth and callback working. Still need to process callback. 2017-09-23 14:57:02 +10:00
Steve Pettitt
3623325cab Add missing files 2017-09-23 14:57:01 +10:00
Steve Pettitt
df18329233 Starting Stripe integration 2017-09-23 14:57:01 +10:00
Rob Harrington
f3322dd82e Transfer responsibility for checking for orphaned PayPal payments from Payment model to Spree::PayPalController 2017-09-23 14:26:03 +10:00
Rob Harrington
d2d07f0362 Update translation scope for PayPal checkout cancellation message 2017-09-23 14:26:03 +10:00
Rob Harrington
131d9384c2 Use flash.notice instead of flash.success to display order confirmation message 
This way it overwrites any message that is set from spree, rather than displaying duplicate messages
 2017-09-23 14:25:55 +10:00
Rob Harrington
7beb6e624c Darkswarm flash loader works with :notice flash messages 2017-09-23 14:09:13 +10:00
Maikel Linke
73041e9263 Show shop profiles without closed shops 
The filter for closed shops was filtering profiles as well. That made it
impossible to show profiles without showing closed shops as well.

Replacing the filter for closed shops fixes the "show profiles" feature.

Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1718
 2017-09-22 12:53:21 +10:00
Rob Harrington
11ccb9a6d2 Revert "Fix for #1826, ensure that adjustment states are initialized prior to validation" 
This reverts commit d7de7d462f.

No longer required after we pulled in the correct migrations from Spree
 2017-09-22 11:16:29 +10:00
Continuous Integration
4cec7213b5 Merge remote-tracking branch 'origin/master' into HEAD 2017-09-22 10:07:55 +10:00
Rob Harrington
3f3085c66b Add detailed explanation of why #destroy_orphaned_paypal_payments is required 2017-09-21 12:11:46 +10:00
Rob Harrington
f4b1c5de9c Remove orphaned PayPalExpress payments when processing actual PayPalExpress payment 
Fixes both #1074 and #1837
 2017-09-21 12:11:39 +10:00
Maikel Linke
39dc765c63 Add/replace comments and remove useless 2017-09-20 13:23:16 +10:00
Julius Pabrinkis
1fe20eba45 Add backend to be able to switch language by param and persist in cookies and user db 2017-09-20 13:23:15 +10:00
Pau Perez
f50e745826 Change title when navigating to new product page 
We navigate to it by replacing the content of the page through an ajax
call, so we also need change the section title with JS.
 2017-09-15 10:09:25 +10:00
Pau Perez
96e31235da Replace hardcoded strings with i18n keys 2017-09-14 17:31:52 +10:00
Pau Perez
e217f96454 Use Rails lazy lookup for translation keys 
See "lazy" lookup in
http://guides.rubyonrails.org/i18n.html#abstracting-localized-code
 2017-09-14 17:31:52 +10:00
Rob Harrington
d7de7d462f Fix for #1826, ensure that adjustment states are initialized prior to validation 2017-09-14 13:39:22 +10:00
Rob Harrington
4c238748c6 Prevent accordion controllers from showing missing nextPanel 
Resolves this issue:
https://travis-ci.org/oeoeaio/openfoodnetwork/jobs/273323915
 2017-09-11 11:07:31 +10:00
Pau Perez
1899e2fa98 Fix rubocop failures 2017-09-08 23:55:51 +10:00
Pau Perez
a763c24f3c Doc what with_lock does 2017-09-08 23:55:51 +10:00
Pau Perez
1faa1579f3 Update enterprise fees while locking the order 2017-09-08 23:55:51 +10:00
Pau Perez
5b1947429e Fix odd-even background by relying on Spree 
This removes unnecessary duplication of #destroy. We can make it work by
adding a simple fix in Spree.
 2017-09-08 23:55:50 +10:00
Pau Perez
8db1fa4e77 Move JSON line items responses to a new controller 
Extracts the JSON response from the admin's line item controller which
are only used by the bulk management feature into its own controller.

This decouples spree from an OFN-only feature and allows to remove
unnecessary code. Furthermore, Admin::LineItemsController is gone in
Spree 2.4.0.beta. See: https://github.com/spree/spree/pull/5280
 2017-09-08 23:55:50 +10:00
Pau Perez
b3c94fd688 Revert "Load order also on open and close adjustments" 
This reverts commit d77588431aa26422e2956fd3510a20b35dab1b1c.
 2017-09-08 23:55:50 +10:00
Pau Perez
4d94b65d25 Load order also on open and close adjustments 
@order is not loaded by Spree because we overrode the :before_filter in
spree/admin/orders_controller_decorator.rb. We need to also specify so in the
decorator.
 2017-09-08 23:55:50 +10:00
Enrico Stano
d8e17231ec Revert "Order email translation keys" 
This reverts commit dc30e0b1042602ed8f03fe97444ccce8526e51b3.
 2017-09-08 23:55:50 +10:00
Enrico Stano
ff2b2e17d9 Order email translation keys 2017-09-08 23:55:50 +10:00
Rob Harrington
4b89a1d736 Fix Layout/EmptyLinesAroundClassBody offence in ResetOrderService 2017-09-08 23:55:50 +10:00
Rob Harrington
595d7b5594 Remove conditional assignment from PaymentsController#fire decorator 2017-09-08 23:55:50 +10:00
Enrico Stano
3b8cab9392 Revert "Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR" 
This reverts commit 8126161df2b96f9cec5c34ffaefa093fe5aed858.
 2017-09-08 23:55:50 +10:00
Enrico Stano
9aca5459b7 Revert "Fix removal of product properties" 
This reverts commit 3b94e12f8db0d4d2b2e48c085fab8231ec8e86e8.
 2017-09-08 23:55:50 +10:00
Pau Perez
3a9b71bd1f Add doc to methods and classes [skip ci] 2017-09-08 23:55:50 +10:00
Enrico Stano
62c5ccf904 Address CodeClimate complains 2017-09-08 23:55:50 +10:00
Enrico Stano
2f3f20e433 Remove html_safe and add spec 2017-09-08 23:55:50 +10:00
Pau Perez
85fefcd946 Replace helper with service object 2017-09-08 23:55:50 +10:00
Pau Perez
e087a008c2 Reduce coupling from controller 2017-09-08 23:55:50 +10:00
Pau Perez
4c4969e86b Do not couple with controller's ivar and session 2017-09-08 23:55:50 +10:00
Pau Perez
f6c8a11b7b Move ResetOrderService to new app/services 2017-09-08 23:55:50 +10:00
Pau Perez
bdfd718c51 Use service object directly from controller 2017-09-08 23:55:50 +10:00
Pau Perez
3c73282d57 Manually reset the order once completed 
Spree does not call after_<order.state> methods any more as of
https://github.com/spree/spree/pull/2557, so our #after_complete method
is never triggered and thus the order never reset.

This makes the condition:

```ruby
if current_order.andand.distributor == @order.distributor
```

in app/views/spree/orders/form/_update_buttons.html.haml return false
and as a result the "Back To Cart" button is not shown.

This commit resets the order (emptying the session[:order_id] and
creating a new order, aka. cart) right from the
CheckoutController#update rather than relying on infernal callbacks (of
what the Spree core team itself was unhappy about since long ago
https://github.com/spree/spree/issues/2488). There is the first place
where we know the order has been successfully completed.
 2017-09-08 23:55:50 +10:00