Skip to content

Commit

Permalink
Fix #28
Browse files Browse the repository at this point in the history
  • Loading branch information
sampoyigi committed Dec 10, 2020
1 parent 0547866 commit ea063c4
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public function boot()
{
Event::subscribe(MaxOrderPerTimeslotReached::class);

View::share('showReviews', ReviewSettings::get('allow_reviews', FALSE) == TRUE);
Event::listen('router.beforeRoute', function ($url, $router) {
View::share('showReviews', ReviewSettings::get('allow_reviews', FALSE) == TRUE);
});

$this->addReviewsRelationship();
$this->addAssetsToReviewsSettingsPage();
Expand Down
49 changes: 49 additions & 0 deletions database/migrations/2020_12_10_000300_update_reviews_table.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php

namespace Igniter\Local\Database\Migrations;

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;

class UpdateReviewsTable extends Migration
{
public function up()
{
Schema::table('igniter_reviews', function (Blueprint $table) {
$table->integer('customer_id')->nullable()->change();
$table->string('author')->nullable()->change();
$table->text('review_text')->nullable()->change();
});

$this->updateMorphsOnReviews();
}

public function down()
{
}

protected function updateMorphsOnReviews()
{
if (DB::table('igniter_reviews')
->where('sale_type', 'Admin\Models\Orders_model')
->orWhere('sale_type', 'Admin\Models\Reservations_model')
->count()
) return;

$morphs = [
'order' => 'Admin\Models\Orders_model',
'reservation' => 'Admin\Models\Reservations_model',
];

DB::table('igniter_reviews')->get()->each(function ($model) use ($morphs) {
if (!isset($morphs[$model->sale_type]))
return FALSE;

DB::table('igniter_reviews')->where('review_id', $model->review_id)->update([
'sale_type' => $morphs[$model->sale_type],
]);
});
}
}
1 change: 1 addition & 0 deletions language/en/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@

'help_allow_reviews' => 'Enable or disable new customer review entry and display of reviews on storefront',
'help_approve_reviews' => 'Approve new review entry automatically or manually',
'help_hints' => 'Used when adding reviews.',

'error_not_found_in_order' => 'The sale ID entered can not be found in orders',
'error_not_found_in_reservation' => 'The sale ID entered can not be found in reservations',
Expand Down
2 changes: 1 addition & 1 deletion models/config/reviewsettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'tab' => 'lang:igniter.local::default.reviews.text_tab_title_reviews',
'type' => 'partial',
'path' => '$/igniter/local/views/reviews/ratings',
'commentAbove' => 'lang:admin::lang.ratings.help_hints',
'commentAbove' => 'lang:igniter.local::default.reviews.help_hints',
],
],
'rules' => [
Expand Down

0 comments on commit ea063c4

Please sign in to comment.