Merge branch 'develop'

howtomakeaturn · Apr 21, 2018 · c230547 · c230547
2 parents 4d7be6e + f353266
commit c230547
Show file tree

Hide file tree

Showing 210 changed files with 2,413 additions and 1,318 deletions.
diff --git a/app/ApproveEditing.php → Modules/NomadiCore/ApproveEditing.php b/app/ApproveEditing.php → Modules/NomadiCore/ApproveEditing.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 class ApproveEditing
 {
 
     function handle()
     {
-        $editing = \App\Editing::whereStatus(\App\Editing::CREATED_STATUS)
+        $editing = \Modules\NomadiCore\Editing::whereStatus(\Modules\NomadiCore\Editing::CREATED_STATUS)
             ->orderBy('created_at', 'asc')->first();
 
         if ($editing && $editing->user->profile->score >= 10) $editing->approve();

diff --git a/app/BusinessHour.php → Modules/NomadiCore/BusinessHour.php b/app/BusinessHour.php → Modules/NomadiCore/BusinessHour.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 use Carbon\Carbon;

diff --git a/app/City.php → Modules/NomadiCore/City.php b/app/City.php → Modules/NomadiCore/City.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Config;
 use DB;
@@ -182,7 +182,7 @@ static function getMapCenter($city)
         }
 
         // otherwise, let's calculate for it
-        $entities = Cafe::whereStatus(Cafe::APPROVED_STATUS)->whereCity($city)->get();
+        $entities = Entity::whereStatus(Entity::APPROVED_STATUS)->whereCity($city)->get();
 
         $latArr = [];
         $lngArr = [];

diff --git a/app/Comment.php → Modules/NomadiCore/Comment.php b/app/Comment.php → Modules/NomadiCore/Comment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,12 +9,12 @@ class Comment extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Modules\NomadiCore\User');
     }
 
     function entity()
     {
-        return $this->belongsTo('App\Entity');
+        return $this->belongsTo('Modules\NomadiCore\Entity');
     }
 
 }
diff --git a/resources/views/posts/_header.blade.php → Modules/NomadiCore/Config/.gitkeep b/resources/views/posts/_header.blade.php → Modules/NomadiCore/Config/.gitkeep
diff --git a/Modules/NomadiCore/Config/config.php b/Modules/NomadiCore/Config/config.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'name' => 'NomadiCore'
+];
diff --git a/Modules/NomadiCore/Console/.gitkeep b/Modules/NomadiCore/Console/.gitkeep
diff --git a/app/DailyEventCounter.php → Modules/NomadiCore/DailyEventCounter.php b/app/DailyEventCounter.php → Modules/NomadiCore/DailyEventCounter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 use DB;

diff --git a/Modules/NomadiCore/Database/Migrations/.gitkeep b/Modules/NomadiCore/Database/Migrations/.gitkeep
diff --git a/Modules/NomadiCore/Database/Seeders/.gitkeep b/Modules/NomadiCore/Database/Seeders/.gitkeep
diff --git a/Modules/NomadiCore/Database/Seeders/NomadiCoreDatabaseSeeder.php b/Modules/NomadiCore/Database/Seeders/NomadiCoreDatabaseSeeder.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\NomadiCore\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+
+class NomadiCoreDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Model::unguard();
+
+        // $this->call("OthersTableSeeder");
+    }
+}
diff --git a/Modules/NomadiCore/Database/factories/.gitkeep b/Modules/NomadiCore/Database/factories/.gitkeep
diff --git a/Modules/NomadiCore/Discussion.php b/Modules/NomadiCore/Discussion.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\NomadiCore;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Discussion extends Model
+{
+
+    public $timestamps = false;
+
+    function posts()
+    {
+        return $this->hasMany('Modules\NomadiCore\Post');
+    }
+
+    function presentBlock()
+    {
+        return view('nomadicore::partial/_post-item', ['discussion' => $this]);
+    }
+
+    function presentBlockSimple()
+    {
+        return view('nomadicore::partial/_post-item-simple', ['discussion' => $this]);
+    }
+
+}
diff --git a/app/Editing.php → Modules/NomadiCore/Editing.php b/app/Editing.php → Modules/NomadiCore/Editing.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
-use App\Editing\Presenter;
+use Modules\NomadiCore\Editing\Presenter;
 
 class Editing extends Model
 {
@@ -36,12 +36,12 @@ public function present()
 
     function entity()
     {
-        return $this->belongsTo('App\Entity');
+        return $this->belongsTo('Modules\NomadiCore\Entity');
     }
 
     function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Modules\NomadiCore\User');
     }
 
     function isChanged($field)
@@ -108,6 +108,10 @@ function approve()
 
         $this->entity->info_fields = json_encode($arr);
 
+        $this->entity->address = $this->address;
+
+        setupEntityCoordinate($this->entity);
+
         $this->entity->save();
     }
 

diff --git a/app/Editing/Presenter.php → Modules/NomadiCore/Editing/Presenter.php b/app/Editing/Presenter.php → Modules/NomadiCore/Editing/Presenter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Editing;
+namespace Modules\NomadiCore\Editing;
 
 use Config;
-use App\Editing;
+use Modules\NomadiCore\Editing;
 
 class Presenter
 {

diff --git a/Modules/NomadiCore/Entities/.gitkeep b/Modules/NomadiCore/Entities/.gitkeep
diff --git a/app/Entity.php → Modules/NomadiCore/Entity.php b/app/Entity.php → Modules/NomadiCore/Entity.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
 use Config;
-use App\Cafe\Presenter;
-use App\Cafe\Api;
-use App\Facebook\FanPage;
-use App\BusinessHour;
+use Modules\NomadiCore\Cafe\Presenter;
+use Modules\NomadiCore\Cafe\Api;
+use Modules\NomadiCore\Facebook\FanPage;
+use Modules\NomadiCore\BusinessHour;
 use Laravel\Scout\Searchable;
 
 class Entity extends Model
@@ -123,52 +123,52 @@ function presentCity()
 
     function fan_page()
     {
-        return $this->hasOne('App\Facebook\FanPage');
+        return $this->hasOne('Modules\NomadiCore\Facebook\FanPage');
     }
 
     function place_detail()
     {
-        return $this->hasOne('App\GooglePlaceDetail');
+        return $this->hasOne('Modules\NomadiCore\GooglePlaceDetail');
     }
 
     function recommendations()
     {
-        return $this->hasMany('App\Recommendation');
+        return $this->hasMany('Modules\NomadiCore\Recommendation');
     }
 
     function reviews()
     {
-        return $this->hasMany('App\Review');
+        return $this->hasMany('Modules\NomadiCore\Review');
     }
 
     function comments()
     {
-        return $this->hasMany('App\Comment');
+        return $this->hasMany('Modules\NomadiCore\Comment');
     }
 
     function wishes()
     {
-        return $this->hasMany('App\Wish');
+        return $this->hasMany('Modules\NomadiCore\Wish');
     }
 
     function photos()
     {
-        return $this->hasMany('App\Photo');
+        return $this->hasMany('Modules\NomadiCore\Photo');
     }
 
     public function tags()
     {
-        return $this->belongsToMany('App\Tag');
+        return $this->belongsToMany('Modules\NomadiCore\Tag');
     }
 
     function business_hours()
     {
-        return $this->hasMany('App\BusinessHour');
+        return $this->hasMany('Modules\NomadiCore\BusinessHour');
     }
 
     function donations()
     {
-        return $this->hasMany('App\Donation');
+        return $this->hasMany('Modules\NomadiCore\Donation');
     }
 
     function uniqueTags()
@@ -404,7 +404,7 @@ function importFromFb($hours)
                 $close_time = null;
             }
 
-            \App\BusinessHour::where('cafe_id', $this->id)->where('day', $businessHour->day)->update([
+            \Modules\NomadiCore\BusinessHour::where('cafe_id', $this->id)->where('day', $businessHour->day)->update([
                 'open_time' => $open_time,
                 'close_time' => $close_time
             ]);

diff --git a/app/EntityTag.php → Modules/NomadiCore/EntityTag.php b/app/EntityTag.php → Modules/NomadiCore/EntityTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,17 +17,17 @@ class EntityTag extends Model
 
     function tag()
     {
-        return $this->belongsTo('App\Tag');
+        return $this->belongsTo('Modules\NomadiCore\Tag');
     }
 
     function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Modules\NomadiCore\User');
     }
 
     function cafe()
     {
-        return $this->belongsTo('App\Cafe');
+        return $this->belongsTo('Modules\NomadiCore\Cafe');
     }
 
 }
diff --git a/app/Event.php → Modules/NomadiCore/Event.php b/app/Event.php → Modules/NomadiCore/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Modules\NomadiCore;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/Modules/NomadiCore/Http/Controllers/.gitkeep b/Modules/NomadiCore/Http/Controllers/.gitkeep