Merge branch 'master' of https://gitlab.com/Saeid74/cssd

app/Http/Controllers/CycleController.php

@@ -51,6 +51,7 @@ class CycleController extends Controller
         $Cycle->load('user', 'packages');
         return \MessageResponse::data($Cycle);
     }
+    
     public function update(StoreCycleRequest $request, Cycle $Cycle)
     {
         $Cycle->update($request->except(['packages']));

database/2019_04_11_104800_create_users_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->string('email')->nullable();
+            $table->string('country_code');
+            $table->string('cell_number');
+            $table->enum('gender', ['Male','FeMale'])->default('Male');
+            $table->enum('verified', ['Verified','NotVerified'])->default('NotVerified');
+            $table->enum('status', ['Active','Suspended'])->default('Active');
+            $table->unsignedBigInteger('medical_center_id');
+            $table->foreign('medical_center_id')->references('id')->on('medical_centers');
+            $table->string('password');
+            $table->string('address')->nullable();
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+}

database/migrations/2019_04_11_104800_create_users_table.php

@@ -17,7 +17,7 @@ class CreateUsersTable extends Migration
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('email')->nullable();
-            $table->string('country_code');
+            $table->string('country_code')->default('0098');;
             $table->string('cell_number');
             $table->enum('gender', ['Male','FeMale'])->default('Male');
             $table->enum('verified', ['Verified','NotVerified'])->default('NotVerified');

routes/api.php

@@ -35,7 +35,7 @@ Route::middleware('auth:api')->group(function () {
     // Route::get('/TestTypes/All', 'TestTypeController@AllTestTypes');
     // Route::get('/MedicalCenters/All', 'MedicalCenterController@listMedicalCenters');
     Route::post('/BarCode/{Code}', 'BarCodeController@generateBarcode');
-    Route::post('/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
+    Route::post('/TestResult/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
 
     Route::get('/GetInfo', 'UserController@getInfo');
     Route::get('Users/MedicalCenter/{MedicalCenter}', 'UserController@getByMedicalCenter');
@@ -54,7 +54,7 @@ Route::middleware('auth:api')->group(function () {
     Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage');
     Route::get('/GetItems', 'ItemController@getItems');
     Route::get('/GetPackages', 'PackageController@getPackages');
-    
+
     Route::resource('Cycles', 'CycleController');
 });