Merge pull request #5 from akaunting/dev-30

denisdulici · web-flow · commit 1c4076dce6bb · 2022-06-02T18:10:15.000+03:00
Akaunting 3.0 compatibility
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
-/.idea
-/.history
-/.vscode
-/.vagrant
-/node_modules
-/storage/*.key
+/.idea
+/.history
+/.vscode
+/.vagrant
+/node_modules
+/storage/*.key
 /vendor
diff --git a/Http/Controllers/Payment.php b/Http/Controllers/Payment.php
@@ -17,7 +17,7 @@ class Payment extends PaymentController
 
     public $type = 'redirect';
 
-    public function show(Document $invoice, PaymentRequest $request)
+    public function show(Document $invoice, PaymentRequest $request, $cards = [])
     {
         $setting = $this->setting;
 
@@ -30,8 +30,10 @@ public function show(Document $invoice, PaymentRequest $request)
         }
 
         $invoice_url = $this->getInvoiceUrl($invoice);
+        $return_url = $this->getReturnUrl($invoice);
+        $confirm_url = $this->getConfirmUrl($invoice);
 
-        $html = view('paypal-standard::show', compact('setting', 'invoice', 'invoice_url'))->render();
+        $html = view('paypal-standard::show', compact('setting', 'invoice', 'invoice_url', 'return_url', 'confirm_url'))->render();
 
         return response()->json([
             'code' => $setting['code'],
@@ -66,13 +68,15 @@ public function return(Document $invoice, Request $request)
 
         if ($success) {
             flash($message)->success();
+
+            $url = $this->getFinishUrl($invoice);
         } else {
             flash($message)->warning();
-        }
 
-        $invoice_url = $this->getInvoiceUrl($invoice);
+            $url = $this->getInvoiceUrl($invoice);
+        }
 
-        return redirect($invoice_url);
+        return redirect($url);
     }
 
     public function complete(Document $invoice, Request $request)
diff --git a/Resources/views/show.blade.php b/Resources/views/show.blade.php
@@ -23,7 +23,7 @@
                 <?php $i = 1; ?>
                 @foreach ($invoice->items as $item)
                     <input type="hidden" name="item_name_{{ $i }}" value="{{ $item->name }}" />
-                    <input type="hidden" name="amount_{{ $i }}" value="{{ $invoice->amount }}" />
+                    <input type="hidden" name="amount_{{ $i }}" value="{{ $item->price }}" />
                     <input type="hidden" name="quantity_{{ $i }}" value="{{ $item->quantity }}" />
                     <?php $i++; ?>
                 @endforeach
@@ -39,8 +39,8 @@
                 <input type="hidden" name="no_note" value="1" />
                 <input type="hidden" name="no_shipping" value="1" />
                 <input type="hidden" name="charset" value="utf-8" />
-                <input type="hidden" name="return" value="{{ route('portal.paypal-standard.invoices.return', $invoice->id) }}" />
-                <input type="hidden" name="notify_url" value="{{ route('portal.paypal-standard.invoices.complete', $invoice->id) }}" />
+                <input type="hidden" name="return" value="{{ $return_url }}" />
+                <input type="hidden" name="notify_url" value="{{ $confirm_url }}" />
                 <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
                 <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
                 <input type="hidden" name="custom" value="{{ $invoice->id }}" />
diff --git a/Routes/guest.php b/Routes/guest.php
@@ -10,5 +10,5 @@
 
 Route::portal('paypal-standard', function () {
     Route::get('invoices/{invoice}/complete', 'Payment@return')->name('invoices.return');
-    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.complete');
+    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.confirm');
 }, ['middleware' => 'guest']);
diff --git a/Routes/signed.php b/Routes/signed.php
@@ -10,4 +10,6 @@
 
 Route::signed('paypal-standard', function () {
     Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
+    Route::get('invoices/{invoice}/complete', 'Payment@return')->name('invoices.return');
+    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.confirm');
 });
diff --git a/Tests/Feature/SettingsTest.php b/Tests/Feature/SettingsTest.php
@@ -6,26 +6,20 @@
 
 class SettingsTest extends FeatureTestCase
 {
-    public function testItShouldSeePaypalStandardInSettingsListPage()
-    {
-        $this->loginAs()
-            ->get(route('settings.index'))
-            ->assertStatus(200)
-            ->assertSeeText(trans('paypal-standard::general.description'));
-    }
-
     public function testItShouldSeePaypalStandardSettingsUpdatePage()
     {
         $this->loginAs()
             ->get(route('settings.module.edit', ['alias' => 'paypal-standard']))
-            ->assertStatus(200);
+            ->assertOk()
+            ->assertSeeText(trans('paypal-standard::general.name'))
+            ->assertSeeText(trans('paypal-standard::general.description'));
     }
 
     public function testItShouldUpdatePaypalStandardSettings()
     {
         $this->loginAs()
             ->patch(route('settings.module.edit', ['alias' => 'paypal-standard']), $this->getRequest())
-            ->assertStatus(200);
+            ->assertOk();
 
         $this->assertFlashLevel('success');
     }
diff --git a/crowdin.yml b/crowdin.yml
@@ -1,14 +1,14 @@
-"project_id_env": CROWDIN_PROJECT_ID
-"api_token_env": CROWDIN_PERSONAL_TOKEN
-"preserve_hierarchy": true
-
-"files": [
-  {
-    "source": "Resources/lang/en-GB/general.php",
-    "dest": "paypal-standard/general.php",
-    "translation": "Resources/lang/%locale%/paypal-standard/general.php",
-    "translation_replace": {
-      "paypal-standard/": ""
-    }
-  }
-]
+"project_id_env": CROWDIN_PROJECT_ID
+"api_token_env": CROWDIN_PERSONAL_TOKEN
+"preserve_hierarchy": true
+
+"files": [
+  {
+    "source": "Resources/lang/en-GB/general.php",
+    "dest": "paypal-standard/general.php",
+    "translation": "Resources/lang/%locale%/paypal-standard/general.php",
+    "translation_replace": {
+      "paypal-standard/": ""
+    }
+  }
+]
diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
     "alias": "paypal-standard",
-    "icon": "fab fa-paypal",
+    "icon": "simple-icons-paypal",
     "version": "2.0.1",
     "active": 1,
     "providers": [
@@ -14,7 +14,7 @@
     "widgets": [],
     "settings": [
         {
-            "type": "textGroup",
+            "type": "text",
             "name": "name",
             "title": "general.name",
             "icon": "fa fa-font",
@@ -24,7 +24,7 @@
             "rules": "required|string"
         },
         {
-            "type": "textGroup",
+            "type": "text",
             "name": "email",
             "title": "paypal-standard::general.form.email",
             "icon": "envelope",
@@ -34,7 +34,7 @@
             "rules": "required|email"
         },
         {
-            "type": "selectGroup",
+            "type": "select",
             "name": "mode",
             "title": "paypal-standard::general.form.mode",
             "icon": "plane",
@@ -49,7 +49,7 @@
             "rules": "required|string"
         },
         {
-            "type": "selectGroup",
+            "type": "select",
             "name": "transaction",
             "title": "paypal-standard::general.form.transaction",
             "icon": "exchange-alt",
@@ -64,23 +64,23 @@
             "rules": "required|string"
         },
         {
-            "type": "accountSelectGroup",
+            "type": "account",
             "name": "account_id",
             "attributes": {
                 "required": "required"
             },
             "rules": "required"
         },
         {
-            "type": "textGroup",
+            "type": "text",
             "name": "order",
             "title": "paypal-standard::general.form.order",
             "icon": "sort",
             "attributes": {},
             "rules": "nullable|integer"
         },
         {
-            "type": "radioGroup",
+            "type": "toggle",
             "name": "customer",
             "title": "paypal-standard::general.form.customer",
             "enable": "general.yes",
@@ -89,7 +89,7 @@
             "rules": "required|integer"
         },
         {
-            "type": "radioGroup",
+            "type": "toggle",
             "name": "debug",
             "title": "paypal-standard::general.form.debug",
             "enable": "general.yes",

Original file line number	Diff line number	Diff line change
`@@ -6,26 +6,20 @@`
`6`	`6`
`7`	`7`	`class SettingsTest extends FeatureTestCase`
`8`	`8`	`{`
`9`		`- public function testItShouldSeePaypalStandardInSettingsListPage()`
`10`		`- {`
`11`		`- $this->loginAs()`
`12`		`- ->get(route('settings.index'))`
`13`		`- ->assertStatus(200)`
`14`		`- ->assertSeeText(trans('paypal-standard::general.description'));`
`15`		`- }`
`16`		`-`
`17`	`9`	`public function testItShouldSeePaypalStandardSettingsUpdatePage()`
`18`	`10`	`{`
`19`	`11`	`$this->loginAs()`
`20`	`12`	`->get(route('settings.module.edit', ['alias' => 'paypal-standard']))`
`21`		`- ->assertStatus(200);`
	`13`	`+ ->assertOk()`
	`14`	`+ ->assertSeeText(trans('paypal-standard::general.name'))`
	`15`	`+ ->assertSeeText(trans('paypal-standard::general.description'));`
`22`	`16`	`}`
`23`	`17`
`24`	`18`	`public function testItShouldUpdatePaypalStandardSettings()`
`25`	`19`	`{`
`26`	`20`	`$this->loginAs()`
`27`	`21`	`->patch(route('settings.module.edit', ['alias' => 'paypal-standard']), $this->getRequest())`
`28`		`- ->assertStatus(200);`
	`22`	`+ ->assertOk();`
`29`	`23`
`30`	`24`	`$this->assertFlashLevel('success');`
`31`	`25`	`}`