Merge pull request #21 from poing/0.2.2

0.2.2

Author: poing

composer.json

@@ -35,7 +35,7 @@
         "zero-fill",
         "zerofill"
     ],
-    "version": "0.2.1",
+    "version": "0.2.2",
     "homepage": "https://github.com/poing/earmark",
     "license": "MIT",
     "authors": [
@@ -54,8 +54,7 @@
         "illuminate/database": ">=11.0",
         "illuminate/events": ">=11.0",
         "illuminate/filesystem": ">=11.0",
-        "illuminate/support": ">=11.0",
-        "laravel/legacy-factories": "^1.4"
+        "illuminate/support": ">=11.0"
     },
     "require-dev": {
         "orchestra/testbench": "^9.0",

source/EarmarkServiceProvider.php

@@ -88,7 +88,16 @@ public function register()
      * @return void
      */
     protected function registerEloquentFactoriesFrom($path)
+    {
+        if (app()->runningInConsole()) {
+            $this->loadFactoriesFrom($path);
+        }
+    }
+
+    /*  Depreciated
+    protected function registerEloquentFactoriesFrom($path)
     {
         $this->app->make(EloquentFactory::class)->load($path);
     }
+    */
 }

source/Http/Controllers/Serial.php

@@ -115,13 +115,27 @@ private function affix($number)
         return $this->prefix.$data; // . $this->suffix;
     }
 
+    private function unfix($number)
+    {
+        if ($this->prefix) {
+            $data = ltrim($number, $this->prefix);
+        } else {
+            $data = $number;
+        }
+
+        //return rtrim($data,$this->suffix);
+        return $data;
+    }
+
+    /*
     private function unfix($number)
     {
         $data = ltrim($number, $this->prefix);
 
         //return rtrim($data,$this->suffix);
         return $data;
     }
+    */
 
     public function getMax()
     {

source/database/.gitignore renamed to source/database.legecy/.gitignore

@@ -0,0 +1,24 @@
+<?php
+
+use Faker\Generator as Faker;
+use Poing\Earmark\Helpers\Boost;
+
+$foo = new Boost;
+$count = $foo->autoIncrement();
+
+$factory->define(Poing\Earmark\Models\EarMark::class, function (Faker $faker) use ($count) {
+    $count->next();
+    $count->next();
+
+    return [
+        /*
+        'digit' => $faker->numberBetween(
+            config('earmark.range.min'),
+            config('earmark.range.max')
+        ),
+    */
+        'digit' => $autoIncrement->current(),
+        'prefix' => config('earmark.prefix'),
+        'type' => $faker->word,
+    ];
+});

source/database.legecy/factories/EarMarkFactory.php

@@ -1,24 +1,27 @@
 <?php
 
-use Faker\Generator as Faker;
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Poing\Earmark\Helpers\Boost;
+use Poing\Earmark\Models\EarMark;
+
+class EarMarkFactory extends Factory
+{
+    protected $model = EarMark::class;
 
-$foo = new Boost;
-$count = $foo->autoIncrement();
+    public function definition()
+    {
+        $boost = new Boost;
+        $count = $boost->autoIncrement();
 
-$factory->define(Poing\Earmark\Models\EarMark::class, function (Faker $faker) use ($count) {
-    $count->next();
-    $count->next();
+        $count->next();
+        $count->next();
 
-    return [
-        /*
-        'digit' => $faker->numberBetween(
-            config('earmark.range.min'),
-            config('earmark.range.max')
-        ),
-    */
-        'digit' => $autoIncrement->current(),
-        'prefix' => config('earmark.prefix'),
-        'type' => $faker->word,
-    ];
-});
+        return [
+            'digit' => $count->current(),
+            'prefix' => config('earmark.prefix'),
+            'type' => $this->faker->word,
+        ];
+    }
+}

source/database/migrations/2019_05_22_090330_create_earmark_hold_table.php renamed to source/database.legecy/migrations/2019_05_22_090330_create_earmark_hold_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAccrualsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('earmark_accrual', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('accruals');
+    }
+}

source/database/migrations/2019_05_22_090330_create_earmark_table.php renamed to source/database.legecy/migrations/2019_05_22_090330_create_earmark_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateEarmarkHoldTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('earmark_hold', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer(config('earmark.columns.digit'));
+            $table->string(config('earmark.columns.group'))->nullable();
+            $table->timestamps();
+
+            $table->index(config('earmark.columns.digit'));
+            $table->index(config('earmark.columns.group'));
+        });
+
+        // Poing\Earmark\Models\EarMark::max('digit')
+        // Poing\Earmark\Models\EarMark::where('type','alpha')->max('digit')
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('earmark_hold');
+    }
+}

source/database/migrations/2019_05_27_062621_create_accruals_table.php renamed to source/database.legecy/migrations/2019_05_27_062621_create_accruals_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateEarmarkTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('earmark', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer(config('earmark.columns.digit'));
+            $table->string(config('earmark.columns.group'))->nullable();
+            $table->timestamps();
+
+            $table->index(config('earmark.columns.digit'));
+            $table->index(config('earmark.columns.group'));
+        });
+
+        // Poing\Earmark\Models\EarMark::max('digit')
+        // Poing\Earmark\Models\EarMark::where('type','alpha')->max('digit')
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('earmark');
+    }
+}

source/database/seeds/EarMark.php renamed to source/database.legecy/seeds/EarMark.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class EarMark extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+    }
+}