cryptommer / smsirlaravel

config/config.php

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
     // you can change default route from sms-admin to anything you want
     'route' => 'sms-admin',
     // SMS.ir Web Service URL
-    'webservice-url' => env('SMSIR-WEBSERVICE-URL','https://ws.sms.ir/'),
+    'webservice-url' => env('SMSIR-WEBSERVICE-URL', 'https://ws.sms.ir/'),
     // SMS.ir Api Key
-    'api-key' => env('SMSIR-API-KEY','Your api key'),
+    'api-key' => env('SMSIR-API-KEY', 'Your api key'),
     // SMS.ir Secret Key
-    'secret-key' => env('SMSIR-SECRET-KEY','Your secret key'),
+    'secret-key' => env('SMSIR-SECRET-KEY', 'Your secret key'),
     // Your sms.ir line number
-    'line-number' => env('SMSIR-LINE-NUMBER','Your Sms.ir Line Number'),
+    'line-number' => env('SMSIR-LINE-NUMBER', 'Your Sms.ir Line Number'),
     // ======================================================================
     // set true if you want log to the database
     'db-log' => true,

src/SmsirlaravelServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     {
 
         if (config('smsirlaravel.panel-routes', true)) {
-            $this->loadRoutesFrom(__DIR__ . '/routes.php');
+            $this->loadRoutesFrom(__DIR__.'/routes.php');
         }
         $this->loadViewsFrom(__DIR__.'/views', 'smsirlaravel');
 
@@ -47,7 +47,7 @@ 
         $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'smsirlaravel');
 
         // Register the main class to use with the facade
-        $this->app->singleton('smsirlaravel', function () {
+        $this->app->singleton('smsirlaravel', function() {
             return new Smsirlaravel;
         });
     }

src/routes.php

Indentation +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@
 <?php
     Route::group(['namespace'=>'Ipecompany\Smsirlaravel\Controllers','middleware'=>config('smsirlaravel.middlewares')], function (){
-	Route::get(config('smsirlaravel.route'),'SmsirlaravelController@index')->name('sms-admin');
-	Route::get('sms-admin/{log}/delete','SmsirlaravelController@delete')->name('deleteLog');
+    Route::get(config('smsirlaravel.route'),'SmsirlaravelController@index')->name('sms-admin');
+    Route::get('sms-admin/{log}/delete','SmsirlaravelController@delete')->name('deleteLog');
 });

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <?php
-    Route::group(['namespace'=>'Ipecompany\Smsirlaravel\Controllers','middleware'=>config('smsirlaravel.middlewares')], function (){
-	Route::get(config('smsirlaravel.route'),'SmsirlaravelController@index')->name('sms-admin');
-	Route::get('sms-admin/{log}/delete','SmsirlaravelController@delete')->name('deleteLog');
+    Route::group(['namespace'=>'Ipecompany\Smsirlaravel\Controllers', 'middleware'=>config('smsirlaravel.middlewares')], function() {
+	Route::get(config('smsirlaravel.route'), 'SmsirlaravelController@index')->name('sms-admin');
+	Route::get('sms-admin/{log}/delete', 'SmsirlaravelController@delete')->name('deleteLog');
 });

src/Models/SmsirlaravelLogs.php

Indentation +8 added lines, -8 removed lines

@@ -6,15 +6,15 @@
 

 class SmsirlaravelLogs extends Model

 {

-	protected $guarded = [];

-	protected $table = 'smsirlaravel_logs';

+    protected $guarded = [];

+    protected $table = 'smsirlaravel_logs';

 

-	public function sendStatus() {

-		if($this->status){

-			return '<i class="fa fa-check-circle" aria-hidden="true" style="color: green"></i>';

-		}

+    public function sendStatus() {

+        if($this->status){

+            return '<i class="fa fa-check-circle" aria-hidden="true" style="color: green"></i>';

+        }

 		

-		return '<i class="fa fa-exclamation-circle" aria-hidden="true" style="color: red"></i>';

+        return '<i class="fa fa-exclamation-circle" aria-hidden="true" style="color: red"></i>';

 		

-	}

+    }

 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	protected $table = 'smsirlaravel_logs';

 

 	public function sendStatus() {

-		if($this->status){

+		if ($this->status) {

 			return '<i class="fa fa-check-circle" aria-hidden="true" style="color: green"></i>';

 		}

 		

src/Smsirlaravel.php

Spacing +59 added lines, -59 removed lines

@@ -8,20 +8,20 @@ 
 class Smsirlaravel
 {
     public static function DBlog($result, $messages, $numbers) {
-        if(config('smsirlaravel.db-log')) {
+        if (config('smsirlaravel.db-log')) {
             if (!is_array($numbers)) {
                 $numbers = array($numbers);
             }
-            $res = json_decode($result->getBody()->getContents(),true);
+            $res = json_decode($result->getBody()->getContents(), true);
 
-            if(count($messages) == 1) {
-                foreach ( $numbers as $number ) {
+            if (count($messages) == 1) {
+                foreach ($numbers as $number) {
                     if (is_array($messages)) {
                         $msg = $messages[0];
                     } else {
                         $msg = $messages;
                     }
-                    $log = SmsirlaravelLogs::create( [
+                    $log = SmsirlaravelLogs::create([
                         'response' => $res['Message'],
                         'message'  => $msg,
                         'status'   => $res['IsSuccessful'],
@@ -30,8 +30,8 @@ 
                     ]);
                 }
             } else {
-                foreach ( array_combine( $messages, $numbers ) as $message => $number ) {
-                    SmsirlaravelLogs::create( [
+                foreach (array_combine($messages, $numbers) as $message => $number) {
+                    SmsirlaravelLogs::create([
                         'response' => $res['Message'],
                         'message'  => $message,
                         'status'   => $res['IsSuccessful'],
@@ -51,9 +51,9 @@ 
     public static function getToken()
     {
         $client     = new Client();
-        $body       = ['UserApiKey'=>config('smsirlaravel.api-key'),'SecretKey'=>config('smsirlaravel.secret-key'),'System'=>'laravel_v_1_4'];
-        $result     = $client->post(config('smsirlaravel.webservice-url').'api/Token',['json'=>$body,'connect_timeout'=>30]);
-        return json_decode($result->getBody(),true)['TokenKey'];
+        $body       = ['UserApiKey'=>config('smsirlaravel.api-key'), 'SecretKey'=>config('smsirlaravel.secret-key'), 'System'=>'laravel_v_1_4'];
+        $result     = $client->post(config('smsirlaravel.webservice-url').'api/Token', ['json'=>$body, 'connect_timeout'=>30]);
+        return json_decode($result->getBody(), true)['TokenKey'];
     }
 
     /**
@@ -64,8 +64,8 @@ 
     public static function credit()
     {
         $client     = new Client();
-        $result     = $client->get(config('smsirlaravel.webservice-url').'api/credit',['headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
-        return json_decode($result->getBody(),true)['Credit'];
+        $result     = $client->get(config('smsirlaravel.webservice-url').'api/credit', ['headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
+        return json_decode($result->getBody(), true)['Credit'];
     }
 
     /**
@@ -76,8 +76,8 @@ 
     public static function getLines()
     {
         $client     = new Client();
-        $result     = $client->get(config('smsirlaravel.webservice-url').'api/SMSLine',['headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
-        return json_decode($result->getBody(),true);
+        $result     = $client->get(config('smsirlaravel.webservice-url').'api/SMSLine', ['headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -89,21 +89,21 @@ 
      *
      * @return mixed, return status
      */
-    public static function send($messages,$numbers,$sendDateTime = null)
+    public static function send($messages, $numbers, $sendDateTime = null)
     {
-        $client     = new Client();
-        $messages = (array)$messages;
-        $numbers = (array)$numbers;
-        if($sendDateTime === null) {
-            $body   = ['Messages'=>$messages,'MobileNumbers'=>$numbers,'LineNumber'=>config('smsirlaravel.line-number')];
+        $client = new Client();
+        $messages = (array) $messages;
+        $numbers = (array) $numbers;
+        if ($sendDateTime === null) {
+            $body   = ['Messages'=>$messages, 'MobileNumbers'=>$numbers, 'LineNumber'=>config('smsirlaravel.line-number')];
         } else {
-            $body   = ['Messages'=>$messages,'MobileNumbers'=>$numbers,'LineNumber'=>config('smsirlaravel.line-number'),'SendDateTime'=>$sendDateTime];
+            $body   = ['Messages'=>$messages, 'MobileNumbers'=>$numbers, 'LineNumber'=>config('smsirlaravel.line-number'), 'SendDateTime'=>$sendDateTime];
         }
-        $result     = $client->post(config('smsirlaravel.webservice-url').'api/MessageSend',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $result     = $client->post(config('smsirlaravel.webservice-url').'api/MessageSend', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
-        self::DBlog($result,$messages,$numbers);
+        self::DBlog($result, $messages, $numbers);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -118,16 +118,16 @@ 
      *
      * @return \Psr\Http\Message\ResponseInterface = $result as json
      */
-    public static function addToCustomerClub($prefix,$firstName,$lastName,$mobile,$birthDay = '',$categotyId = '')
+    public static function addToCustomerClub($prefix, $firstName, $lastName, $mobile, $birthDay = '', $categotyId = '')
     {
         $client     = new Client();
-        $body       = ['Prefix'=>$prefix,'FirstName'=>$firstName,'LastName'=>$lastName,'Mobile'=>$mobile,'BirthDay'=>$birthDay,'CategoryId'=>$categotyId];
-        $result     = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClubContact',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $body       = ['Prefix'=>$prefix, 'FirstName'=>$firstName, 'LastName'=>$lastName, 'Mobile'=>$mobile, 'BirthDay'=>$birthDay, 'CategoryId'=>$categotyId];
+        $result     = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClubContact', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
         // $res        = json_decode($result->getBody()->getContents(),true);
 
-        self::DBlog($result,"افزودن $firstName $lastName به مخاطبین باشگاه ",$mobile);
+        self::DBlog($result, "افزودن $firstName $lastName به مخاطبین باشگاه ", $mobile);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -140,21 +140,21 @@ 
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public static function sendToCustomerClub($messages,$numbers,$sendDateTime = null,$canContinueInCaseOfError = true)
+    public static function sendToCustomerClub($messages, $numbers, $sendDateTime = null, $canContinueInCaseOfError = true)
     {
-        $client     = new Client();
-        $messages = (array)$messages;
-        $numbers = (array)$numbers;
-        if($sendDateTime !== null) {
-            $body   = ['Messages'=>$messages,'MobileNumbers'=>$numbers,'SendDateTime'=>$sendDateTime,'CanContinueInCaseOfError'=>$canContinueInCaseOfError];
+        $client = new Client();
+        $messages = (array) $messages;
+        $numbers = (array) $numbers;
+        if ($sendDateTime !== null) {
+            $body   = ['Messages'=>$messages, 'MobileNumbers'=>$numbers, 'SendDateTime'=>$sendDateTime, 'CanContinueInCaseOfError'=>$canContinueInCaseOfError];
         } else {
-            $body   = ['Messages'=>$messages,'MobileNumbers'=>$numbers,'CanContinueInCaseOfError'=>$canContinueInCaseOfError];
+            $body   = ['Messages'=>$messages, 'MobileNumbers'=>$numbers, 'CanContinueInCaseOfError'=>$canContinueInCaseOfError];
         }
-        $result     = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/Send',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $result     = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/Send', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
-        self::DBlog($result,$messages,$numbers);
+        self::DBlog($result, $messages, $numbers);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
 
     }
 
@@ -171,15 +171,15 @@ 
      *
      * @return mixed
      */
-    public static function addContactAndSend($prefix,$firstName,$lastName,$mobile,$message,$birthDay = '',$categotyId = '')
+    public static function addContactAndSend($prefix, $firstName, $lastName, $mobile, $message, $birthDay = '', $categotyId = '')
     {
         $client = new Client();
-        $body   = ['Prefix'=>$prefix,'FirstName'=>$firstName,'LastName'=>$lastName,'Mobile'=>$mobile,'BirthDay'=>$birthDay,'CategoryId'=>$categotyId,'MessageText'=>$message];
-        $result = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/AddContactAndSend',['json'=>[$body],'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $body   = ['Prefix'=>$prefix, 'FirstName'=>$firstName, 'LastName'=>$lastName, 'Mobile'=>$mobile, 'BirthDay'=>$birthDay, 'CategoryId'=>$categotyId, 'MessageText'=>$message];
+        $result = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/AddContactAndSend', ['json'=>[$body], 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
-        self::DBlog($result,$message,$mobile);
+        self::DBlog($result, $message, $mobile);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -192,15 +192,15 @@ 
      *
      * @return mixed
      */
-    public static function sendVerification($code,$number,$log = false)
+    public static function sendVerification($code, $number, $log = false)
     {
         $client = new Client();
-        $body   = ['Code'=>$code,'MobileNumber'=>$number];
-        $result = $client->post(config('smsirlaravel.webservice-url').'api/VerificationCode',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
-        if($log) {
-            self::DBlog($result,$code,$number);
+        $body   = ['Code'=>$code, 'MobileNumber'=>$number];
+        $result = $client->post(config('smsirlaravel.webservice-url').'api/VerificationCode', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
+        if ($log) {
+            self::DBlog($result, $code, $number);
         }
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -215,10 +215,10 @@ 
             $params[] = ['Parameter' => $key, 'ParameterValue' => $value];
         }
         $client = new Client();
-        $body   = ['ParameterArray' => $params,'TemplateId' => $template_id,'Mobile' => $number];
-        $result = $client->post(config('smsirlaravel.webservice-url').'api/UltraFastSend',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $body   = ['ParameterArray' => $params, 'TemplateId' => $template_id, 'Mobile' => $number];
+        $result = $client->post(config('smsirlaravel.webservice-url').'api/UltraFastSend', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
     /**
@@ -231,10 +231,10 @@ 
      *
      * @return mixed
      */
-    public static function getReceivedMessages($perPage,$pageNumber,$formDate,$toDate)
+    public static function getReceivedMessages($perPage, $pageNumber, $formDate, $toDate)
     {
         $client = new Client();
-        $result = $client->get(config('smsirlaravel.webservice-url')."api/ReceiveMessage?Shamsi_FromDate={$formDate}&Shamsi_ToDate={$toDate}&RowsPerPage={$perPage}&RequestedPageNumber={$pageNumber}",['headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $result = $client->get(config('smsirlaravel.webservice-url')."api/ReceiveMessage?Shamsi_FromDate={$formDate}&Shamsi_ToDate={$toDate}&RowsPerPage={$perPage}&RequestedPageNumber={$pageNumber}", ['headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
         return json_decode($result->getBody()->getContents())->Messages;
     }
@@ -249,10 +249,10 @@ 
      *
      * @return mixed
      */
-    public static function getSentMessages($perPage,$pageNumber,$formDate,$toDate)
+    public static function getSentMessages($perPage, $pageNumber, $formDate, $toDate)
     {
         $client = new Client();
-        $result = $client->get(config('smsirlaravel.webservice-url')."api/MessageSend?Shamsi_FromDate={$formDate}&Shamsi_ToDate={$toDate}&RowsPerPage={$perPage}&RequestedPageNumber={$pageNumber}",['headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $result = $client->get(config('smsirlaravel.webservice-url')."api/MessageSend?Shamsi_FromDate={$formDate}&Shamsi_ToDate={$toDate}&RowsPerPage={$perPage}&RequestedPageNumber={$pageNumber}", ['headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
         return json_decode($result->getBody()->getContents())->Messages;
     }
@@ -266,9 +266,9 @@ 
     public static function deleteContact($mobile) {
         $client = new Client();
         $body   = ['Mobile' => $mobile, 'CanContinueInCaseOfError' => false];
-        $result = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/DeleteContactCustomerClub',['json'=>$body,'headers'=>['x-sms-ir-secure-token'=>self::getToken()],'connect_timeout'=>30]);
+        $result = $client->post(config('smsirlaravel.webservice-url').'api/CustomerClub/DeleteContactCustomerClub', ['json'=>$body, 'headers'=>['x-sms-ir-secure-token'=>self::getToken()], 'connect_timeout'=>30]);
 
-        return json_decode($result->getBody(),true);
+        return json_decode($result->getBody(), true);
     }
 
 }

src/Controllers/SmsirlaravelController.php

Indentation +12 added lines, -12 removed lines

@@ -10,17 +10,17 @@
 class SmsirlaravelController extends Controller

 {

 

-	// the main index page for administrators

-	public function index() {

-		$credit = Smsirlaravel::credit();

-		$smsirlaravel_logs = SmsirlaravelLogs::orderBy('id','DESC')->paginate(config('smsirlaravel.in-page'));

-		return view('smsirlaravel::index',compact('credit','smsirlaravel_logs'));

-	}

+    // the main index page for administrators

+    public function index() {

+        $credit = Smsirlaravel::credit();

+        $smsirlaravel_logs = SmsirlaravelLogs::orderBy('id','DESC')->paginate(config('smsirlaravel.in-page'));

+        return view('smsirlaravel::index',compact('credit','smsirlaravel_logs'));

+    }

 

-	// administrators can delete single log

-	public function delete() {

-		SmsirlaravelLogs::where('id',Route::current()->parameters['log'])->delete();

-		// return the user back to sms-admin after delete the log

-		return back();

-	}

+    // administrators can delete single log

+    public function delete() {

+        SmsirlaravelLogs::where('id',Route::current()->parameters['log'])->delete();

+        // return the user back to sms-admin after delete the log

+        return back();

+    }

 }

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@
 	// the main index page for administrators

 	public function index() {

 		$credit = Smsirlaravel::credit();

-		$smsirlaravel_logs = SmsirlaravelLogs::orderBy('id','DESC')->paginate(config('smsirlaravel.in-page'));

-		return view('smsirlaravel::index',compact('credit','smsirlaravel_logs'));

+		$smsirlaravel_logs = SmsirlaravelLogs::orderBy('id', 'DESC')->paginate(config('smsirlaravel.in-page'));

+		return view('smsirlaravel::index', compact('credit', 'smsirlaravel_logs'));

 	}

 

 	// administrators can delete single log

 	public function delete() {

-		SmsirlaravelLogs::where('id',Route::current()->parameters['log'])->delete();

+		SmsirlaravelLogs::where('id', Route::current()->parameters['log'])->delete();

 		// return the user back to sms-admin after delete the log

 		return back();

 	}

src/migrations/2018_12_10_194000_create_smsirlaravel_log_table.php

Indentation +26 added lines, -26 removed lines

@@ -6,31 +6,31 @@
 

 class CreateSmsirlaravelLogTable extends Migration

 {

-	/**

-	 * Run the migrations.

-	 *

-	 * @return void

-	 */

-	public function up()

-	{

-		Schema::create('smsirlaravel_logs', function (Blueprint $table) {

-			$table->increments('id');

-			$table->string('from',100)->nullable();

-			$table->string('to',100)->nullable();

-			$table->string('message',500)->nullable();

-			$table->boolean('status')->nullable();

-			$table->string('response',500)->nullable();

-			$table->timestamps();

-		});

-	}

+    /**

+     * Run the migrations.

+     *

+     * @return void

+     */

+    public function up()

+    {

+        Schema::create('smsirlaravel_logs', function (Blueprint $table) {

+            $table->increments('id');

+            $table->string('from',100)->nullable();

+            $table->string('to',100)->nullable();

+            $table->string('message',500)->nullable();

+            $table->boolean('status')->nullable();

+            $table->string('response',500)->nullable();

+            $table->timestamps();

+        });

+    }

 

-	/**

-	 * Reverse the migrations.

-	 *

-	 * @return void

-	 */

-	public function down()

-	{

-		Schema::dropIfExists('smsirlaravel_logs');

-	}

+    /**

+     * Reverse the migrations.

+     *

+     * @return void

+     */

+    public function down()

+    {

+        Schema::dropIfExists('smsirlaravel_logs');

+    }

 }

Spacing +5 added lines, -5 removed lines

@@ -13,13 +13,13 @@
 	 */

 	public function up()

 	{

-		Schema::create('smsirlaravel_logs', function (Blueprint $table) {

+		Schema::create('smsirlaravel_logs', function(Blueprint $table) {

 			$table->increments('id');

-			$table->string('from',100)->nullable();

-			$table->string('to',100)->nullable();

-			$table->string('message',500)->nullable();

+			$table->string('from', 100)->nullable();

+			$table->string('to', 100)->nullable();

+			$table->string('message', 500)->nullable();

 			$table->boolean('status')->nullable();

-			$table->string('response',500)->nullable();

+			$table->string('response', 500)->nullable();

 			$table->timestamps();

 		});

 	}