Server EBS Work A

Author: Tayeb-Ali

app/Http/Controllers/API/BalanceInquiry.php

@@ -78,7 +78,7 @@ public function balance_inquiry(Request $request){
             $ipin = Functions::encript($publickKey , $uuid , $ipin);
 
             $response = BalanceInquiryModel::sendRequest($transaction->id , $ipin, $bank_id);
-            dd($response);
+//            dd($response);
             if ($response == false) {
                 $res = ["error" => true, "message" => "Some Error Found"];
                 return response()->json($res,200);

app/Http/Controllers/API/CardTransfer.php

@@ -90,7 +90,7 @@ public function card_transfer(Request $request){
             }
             $ipin = Functions::encript($publickKey , $uuid , $ipin);
 
-            $response = CardTransferModel::sendRequest($transaction->id,$ipin);
+            $response = CardTransferModel::sendRequest($transaction->id,$ipin, $bank_id);
             if ($response == false) {
                 $res = ["error" => true, "message" => "Some Error Found"];
                 return response()->json($res,200);

app/Http/Controllers/API/Electricity.php

@@ -103,7 +103,7 @@ public function electricity(Request $request)
 
 
 
-            $response = ElectricityModel::sendRequest($transaction->id  , $ipin);
+            $response = ElectricityModel::sendRequest($transaction->id  , $ipin, $bank_id);
             if ($response == false) {
                 $res = ["error" => true, "message" => "Some Error Found"];
                 return response()->json($res,200);

app/Model/CardTransfer.php

@@ -2,6 +2,7 @@
 
 namespace App\Model;
 
+use App\Functions;
 use App\Model\Account\BankAccount;
 use Illuminate\Database\Eloquent\Model;
 
@@ -12,7 +13,7 @@ class CardTransfer extends Model
     public function transfer(){
         return $this->belongsTo('App\Model\Transfer');
     }
-    public static function requestBuild($transaction_id , $ipin){
+    public static function requestBuild($transaction_id , $ipin, $bank_id){
         $request = array();
         $transaction = Transaction::where("id", $transaction_id)->first();
         $user = User::where("id",$transaction->user_id)->first();
@@ -29,7 +30,7 @@ public static function requestBuild($transaction_id , $ipin){
         $entityId = "";
         $entityType = "";
         $authenticationType = "00";
-        $bank = BankAccount::getBankAccountByUser($user);
+        $bank = Functions::getAccountTypeId($bank_id);
         $PAN = $bank->PAN;
 
         $mbr = $bank->mbr;
@@ -56,8 +57,8 @@ public static function requestBuild($transaction_id , $ipin){
         $request += ["authenticationType" => $authenticationType];
         return $request;
     }
-    public static function sendRequest($transaction_id, $ipin){
-        $request = self::requestBuild($transaction_id, $ipin);
+    public static function sendRequest($transaction_id, $ipin, $bank_id){
+        $request = self::requestBuild($transaction_id, $ipin, $bank_id);
 
         $response = SendRequest::sendRequest($request , self::CardTransfer);
         return $response;

app/Model/Payment/Electricity.php

@@ -2,7 +2,8 @@
 
 namespace App\Model\Payment;
 
-use App\Model\Account\BankAccount;
+use App\Functions;
+//use App\Model\Account\BankAccount;
 use App\Model\SendRequest;
 use App\Model\Transaction;
 use Illuminate\Database\Eloquent\Model;
@@ -21,7 +22,7 @@ public function payment(){
         return $this->belongsTo('App\Model\Payment\Payment' , 'payment_id');
     }
 
-    public static function requestBuild($transaction_id , $ipin){
+    public static function requestBuild($transaction_id , $ipin, $bank_id){
         $transaction = Transaction::where("id", $transaction_id)->first();
         $user = User::where("id",$transaction->user_id)->first();
         $payment = Payment::where("transaction_id", $transaction_id)->first();
@@ -49,7 +50,7 @@ public static function requestBuild($transaction_id , $ipin){
         $mbr = "";
         $expDate = "";
         $authenticationType = "00";
-        $bank = BankAccount::getBankAccountByUser($user);
+        $bank = Functions::getBankAccountByUser($bank_id);
         $PAN = $bank->PAN;
         $mbr = $bank->mbr;
         $expDate = $bank->expDate;
@@ -73,8 +74,8 @@ public static function requestBuild($transaction_id , $ipin){
         //dd($request);
         return $request;
     }
-    public static function sendRequest($transaction_id , $ipin){
-        $request = self::requestBuild($transaction_id , $ipin);
+    public static function sendRequest($transaction_id , $ipin, $bank_id){
+        $request = self::requestBuild($transaction_id , $ipin, $bank_id);
 
         $response = SendRequest::sendRequest($request , self::Payment);
         return $response;

readme.md

@@ -1,68 +1,2 @@
-<p align="center"><img src="https://laravel.com/assets/img/components/logo-laravel.svg"></p>
-<<<<<<< HEAD
-=======
-
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
-
-## About Laravel
-
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as:
-
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
-
-Laravel is accessible, yet powerful, providing tools needed for large, robust applications.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of any modern web application framework, making it a breeze to get started learning the framework.
-
-If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
-
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell):
-
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[British Software Development](https://www.britishsoftware.co)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- [UserInsights](https://userinsights.com)
-- [Fragrantica](https://www.fragrantica.com)
-- [SOFTonSOFA](https://softonsofa.com/)
-- [User10](https://user10.com)
-- [Soumettre.fr](https://soumettre.fr/)
-- [CodeBrisk](https://codebrisk.com)
-- [1Forge](https://1forge.com)
-- [TECPRESSO](https://tecpresso.co.jp/)
-- [Runtime Converter](http://runtimeconverter.com/)
-- [WebL'Agence](https://weblagence.com/)
-- [Invoice Ninja](https://www.invoiceninja.com)
-- [iMi digital](https://www.imi-digital.de/)
-- [Earthlink](https://www.earthlink.ro/)
-- [Steadfast Collective](https://steadfastcollective.com/)
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
-
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
->>>>>>> e168e364d6f1b9acf437e04945dcb6040e850a83
+## بسكويت بركة
+بسكوست الشاي