diff --git a/VERSION.txt b/VERSION.txt index 0b2699b27e43..856ecacea471 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.50 \ No newline at end of file +5.1.51 \ No newline at end of file diff --git a/app/Http/Controllers/PaymentWebhookController.php b/app/Http/Controllers/PaymentWebhookController.php index 88499a90ba6b..7f9d98510b3b 100644 --- a/app/Http/Controllers/PaymentWebhookController.php +++ b/app/Http/Controllers/PaymentWebhookController.php @@ -13,14 +13,22 @@ namespace App\Http\Controllers; use App\Http\Requests\Payments\PaymentWebhookRequest; +use App\Libraries\MultiDB; +use Auth; class PaymentWebhookController extends Controller { public function __invoke(PaymentWebhookRequest $request, string $company_key, string $company_gateway_id) { +dd('here'); + MultiDB::findAndSetDbByCompanyKey($company_key); + $payment = $request->getPayment(); $client = is_null($payment) ? $request->getClient() : $payment->client; + // $contact= $client->primary_contact()->first(); + // Auth::guard('contact')->login($contact, true); + return $request->getCompanyGateway() ->driver($client) ->processWebhookRequest($request, $payment); diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php index 0a03f639aa75..44ea6023b68e 100644 --- a/app/PaymentDrivers/CheckoutCom/CreditCard.php +++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php @@ -141,7 +141,7 @@ class CreditCard $this->checkout->payment_hash->data = array_merge((array)$this->checkout->payment_hash->data, ['checkout_payment_ref' => $payment]); $this->checkout->payment_hash->save(); - if ($this->checkout->client->currency()->code == 'EUR') { + if ($this->checkout->client->currency()->code == 'EUR' || $this->checkout->company_gateway->getConfigField('threeds')) { $payment->{'3ds'} = ['enabled' => true]; $payment->{'success_url'} = route('payment_webhook', [ diff --git a/config/ninja.php b/config/ninja.php index 323844e0eef7..5cc5d3d6c407 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.50', - 'app_tag' => '5.1.50-release', + 'app_version' => '5.1.51', + 'app_tag' => '5.1.51-release', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/routes/api.php b/routes/api.php index 95dbd4d76881..e969673f1201 100644 --- a/routes/api.php +++ b/routes/api.php @@ -182,11 +182,10 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::resource('subscriptions', 'SubscriptionController'); Route::post('subscriptions/bulk', 'SubscriptionController@bulk')->name('subscriptions.bulk'); - Route::resource('cliente_subscriptions', 'ClientSubscriptionController'); }); Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', 'PaymentWebhookController') - ->middleware(['guest', 'api_db']) + ->middleware(['guest']) ->name('payment_webhook'); Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook');