Restructure

soap · Dec 12, 2024 · 968ab1c · 968ab1c
1 parent 6a4f83a
commit 968ab1c
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 16 deletions.
diff --git a/src/Commands/OmiseAccountCommand.php b/src/Commands/OmiseAccountCommand.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Soap\LaravelOmise\Commands;
+
+use Illuminate\Console\Command;
+
+class OmiseAccountCommand extends Command
+{
+    public $signature = 'omise:account';
+
+    public $description = 'Retrieve account information from Omise API';
+
+    public function handle(): int
+    {
+        $response = app('omise')->account()->retrieve();
+
+        if ($response instanceof \Soap\LaravelOmise\Omise\Error) {
+            $this->error($response->getMessage());
+
+            return self::FAILURE;
+        }
+        $this->line('Account information retrieved successfully!');
+        $this->table(['Key', 'Value'], [
+            ['ID', $response->id],
+            ['Email', $response->email],
+            ['Type', $response->type],
+            ['Name', $response->name],
+            ['Bank', $response->bank],
+            ['Description', $response->description],
+            ['Public Key', $response->public_key],
+            ['Secret Key', $response->secret_key],
+            ['Currency', $response->currency],
+            ['Location', $response->location],
+            ['Created', $response->created],
+        ]);
+
+        return self::SUCCESS;
+    }
+}
diff --git a/src/Facades/Omise.php b/src/Facades/Omise.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Soap\LaravelOmise\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @see \Soap\LaravelOmise\LaravelOmise
+ */
+class Treasurer extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'omise';
+    }
+}
diff --git a/src/LaravelOmiseServiceProvider.php b/src/LaravelOmiseServiceProvider.php
@@ -20,4 +20,11 @@ public function configurePackage(Package $package): void
             ->hasConfigFile()
             ->hasCommand(OmiseVerifyCommand::class);
     }
+
+    public function packageRegistered()
+    {
+        $this->app->singleton('omise', function ($app) {
+            return new Omise($app->make(OmiseConfig::class));
+        });
+    }
 }
diff --git a/src/Omise.php b/src/Omise.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Soap\LaravelOmise;
+
+use Soap\LaravelOmise\Omise\Account;
+use Soap\LaravelOmise\Omise\Charge;
+use Soap\LaravelOmise\Omise\Customer;
+
+class Omise
+{
+    protected $config;
+
+    public function __construct(OmiseConfig $omiseConfig)
+    {
+        $this->config = $omiseConfig;
+    }
+
+    public function account()
+    {
+        return new Account($this->config);
+    }
+
+    public function charge()
+    {
+        return new Charge($this->config);
+    }
+
+    public function customer()
+    {
+        return new Customer($this->config);
+    }
+}
diff --git a/src/Omise/Account.php b/src/Omise/Account.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Soap\LaravelOmise\Omise;
+
+use OmiseAccount;
+use Soap\LaravelOmise\OmiseConfig;
+
+class Account extends BaseObject
+{
+    private $omiseConfig;
+
+    public function __construct(OmiseConfig $omiseConfig)
+    {
+        $this->omiseConfig = $omiseConfig;
+    }
+
+    /**
+     * Retrieve account information
+     *
+     * @return \Soap\LaravelOmise\Omise\Error|self
+     */
+    public function retrieve()
+    {
+        try {
+            $this->refresh(OmiseAccount::retrieve($this->omiseConfig->getPublicKey(), $this->omiseConfig->getSecretKey()));
+        } catch (\Exception $e) {
+            return new Error([
+                'code' => 'not_found',
+                'message' => $e->getMessage(),
+            ]);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Omise/Charge.php b/src/Omise/Charge.php
@@ -5,8 +5,8 @@
 use Exception;
 use OmiseCharge;
 use OmiseRefund;
-use Soap\LaravelOmise\LaravelOmise;
 use Soap\LaravelOmise\Omise\Helpers\OmiseMoney;
+use Soap\LaravelOmise\OmiseConfig;
 
 /**
  * @property object $object
@@ -40,23 +40,21 @@
  */
 class Charge extends BaseObject
 {
-    private $laravelOmise;
+    private $omiseConfig;
 
-    public function __construct(LaravelOmise $laravelOmise)
+    public function __construct(OmiseConfig $omiseConfig)
     {
-        $this->laravelOmise = $laravelOmise;
+        $this->omiseConfig = $omiseConfig;
     }
 
     /**
      * @param  string  $id
-     * @param  int|null  $storeId
      * @return \Soap\LaravelOmise\Omise\Error|self
      */
-    public function find($id, $storeId = null)
+    public function find($id)
     {
         try {
-            // $this->config->setStoreId($storeId);
-            $this->refresh(OmiseCharge::retrieve($id, $this->laravelOmise->getPublicKey(), $this->laravelOmise->getSecretKey()));
+            $this->refresh(OmiseCharge::retrieve($id, $this->omiseConfig->getPublicKey(), $this->omiseConfig->getSecretKey()));
         } catch (Exception $e) {
             return new Error([
                 'code' => 'not_found',
@@ -76,7 +74,7 @@ public function find($id, $storeId = null)
     public function create($params)
     {
         try {
-            $this->refresh(OmiseCharge::create($params, $this->laravelOmise->getPublicKey(), $this->laravelOmise->getSecretKey()));
+            $this->refresh(OmiseCharge::create($params, $this->omiseConfig->getPublicKey(), $this->omiseConfig->getSecretKey()));
         } catch (Exception $e) {
             return new Error([
                 'code' => 'bad_request',

diff --git a/src/Omise/Customer.php b/src/Omise/Customer.php
@@ -4,18 +4,18 @@
 
 use Exception;
 use OmiseCustomer;
-use Soap\LaravelOmise\LaravelOmise;
+use Soap\LaravelOmise\OmiseConfig;
 
 class Customer extends BaseObject
 {
-    private $laravelOmise;
+    private $omiseConfig;
 
     /**
      * Injecting dependencies
      */
-    public function __construct(LaravelOmise $laravelOmise)
+    public function __construct(OmiseConfig $omiseConfig)
     {
-        $this->laravelOmise = $laravelOmise;
+        $this->omiseConfig = $omiseConfig;
     }
 
     /**
@@ -25,7 +25,7 @@ public function __construct(LaravelOmise $laravelOmise)
     public function find($id)
     {
         try {
-            $this->refresh(OmiseCustomer::retrieve($id, $this->laravelOmise->getPublicKey(), $this->laravelOmise->getSecretKey()));
+            $this->refresh(OmiseCustomer::retrieve($id, $this->omiseConfig->getPublicKey(), $this->omiseConfig->getSecretKey()));
         } catch (Exception $e) {
             return new Error([
                 'code' => 'not_found',
@@ -43,7 +43,7 @@ public function find($id)
     public function create($params)
     {
         try {
-            $this->refresh(OmiseCustomer::create($params, $this->laravelOmise->getPublicKey(), $this->laravelOmise->getSecretKey()));
+            $this->refresh(OmiseCustomer::create($params, $this->omiseConfig->getPublicKey(), $this->omiseConfig->getSecretKey()));
         } catch (Exception $e) {
             return new Error([
                 'code' => 'bad_request',

diff --git a/src/LaravelOmise.php → src/OmiseConfig.php b/src/LaravelOmise.php → src/OmiseConfig.php
@@ -2,7 +2,7 @@
 
 namespace Soap\LaravelOmise;
 
-class LaravelOmise
+class OmiseConfig
 {
     protected static $url;