Merge pull request #98 from systeminc/development

Development

Author: maki10

src/Product.php

@@ -30,6 +30,9 @@ class Product extends Model
         'visible',
         'featured',
         'stock',
+        'seo_title',
+        'seo_description',
+        'seo_keywords',
     ];
 
     public function category()

src/database/migrations/2017_06_21_123334_add_seo_to_product_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AddSeoToProductTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('products', function (Blueprint $table) {
+            $table->string('seo_title');
+            $table->string('seo_description');
+            $table->string('seo_keywords');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('products', function (Blueprint $table) {
+            $table->dropColumn('seo_title');
+            $table->dropColumn('seo_description');
+            $table->dropColumn('seo_keywords');
+        });
+    }
+}

src/resources/views/products/gallery.blade.php

@@ -4,10 +4,10 @@
 </div>
 <br><br>
 
-<form style="max-width: 100%;" action="galleries/update/{{ $product->gallery->title }}" class="images" method="post" enctype="multipart/form-data">
+<form style="max-width: 100%;" action="galleries/update/{{ $product->gallery->id }}" class="images" method="post" enctype="multipart/form-data">
 	{{ csrf_field() }}
 	<label for="title">Title:</label>
-	<input type="text" name="title" value="{{ $product->gallery->title }}">	
+	<input type="text" name="title" value="{{ $product->title or $product->gallery->title }}">	
 
 	@if( count($product->gallery->images) )
 		<div class="gallery-wrap"> 
@@ -17,7 +17,9 @@
 						<div class="buttons">
 							<div onclick="ajaxDeleteGalleryImage('ajax/{{ $product->gallery->title }}/delete-gallery-images/{{ $image->id }}', '{{$image->id}}')" class="button remove-image delete">Delete</div>
 						</div>
-						<img src="uploads/{{$image->source}}" />
+						<a href="galleries/image/{{ $product->gallery->id }}/{{ $image->id }}">
+							<img src="uploads/{{$image->source}}" />
+						</a>					
 					</li>
 				@endforeach
 			</ul>

src/resources/views/products/product.blade.php

@@ -104,6 +104,15 @@
 
 				<label>Stock</label>
 				<input type="text" name="stock" value="{{old('stock') ?: $product->stock}}">
+				
+				<label>Seo title</label>
+				<input type="text" name="seo_title" value="{{old('seo_title') ?: $product->seo_title}}">
+				
+				<label>Seo description</label>
+				<input type="text" name="seo_description" value="{{old('seo_description') ?: $product->seo_description}}">
+
+				<label>Seo keywords</label>
+				<input type="text" name="seo_keywords" value="{{old('seo_keywords') ?: $product->seo_keywords}}">
 
 				<div class="cf">
 					<label>Menu Order</label>

src/resources/views/tiny-images.blade.php

@@ -19,6 +19,14 @@
 			});
 		
 			$(".thumb img").click(function(event) {
+				$('form').before('<p class="message">Image added</p>');
+				
+				setTimeout(function() {
+					$('.message').fadeOut();
+				}, 1000);
+
+				$(this).fadeOut('fast').fadeIn('fast');
+
 				window.parent.tinyMCE.get("{{$editor_id}}").execCommand('mceInsertContent',false,'<img style="position: relative; float: left;" src="'+$(this).attr("src")+'">');
 			});
 		
@@ -41,6 +49,10 @@
 
 	<style>
 
+		.close:hover{
+			color: red;
+		}
+		
 		.close{
 			display: block; 
 			text-align: right; 
@@ -50,6 +62,19 @@
 			font-size: 16px;
 		}
 
+		.message {
+		    padding: 15px;
+		    border: 1px solid transparent;
+		    border-radius: 4px;    
+		    color: #3c763d;
+		    background-color: #dff0d8;
+		    border-color: #d6e9c6;
+		    width: 60%;
+		    text-align: center;
+		    display: block;
+		    margin: auto;
+		}
+
 		form {
 			display: inline-block; 
 			background: white; 
@@ -104,7 +129,7 @@
 				<div style="max-width: 500px; min-width:500px; overflow-y:auto; height:300px;">
 
 					@foreach ($images as $image) 
-						<div href="" class="thumb">
+						<div class="thumb">
 							<div class="delete-image" data-path='{{$image}}'>x</div>
 							<img src="../{{ config('laravel-admin.route_prefix') }}/uploads/{{$image}}">
 						</div>						

tests/unit/ModelsTest.php

@@ -151,7 +151,7 @@ public function testFillablefieldsProductModel()
     {
         $product = new Product();
 
-        $this->assertArraySubset(['product_category_id', 'brand_id', 'title', 'slug', 'excerpt', 'description', 'long_description', 'thumb', 'animation', 'video', 'pdf', 'gallery_id', 'price', 'shipment_price', 'menu_order', 'visible', 'featured', 'stock'], $product->getFillable());
+        $this->assertArraySubset(['product_category_id', 'brand_id', 'title', 'slug', 'excerpt', 'description', 'long_description', 'thumb', 'animation', 'video', 'pdf', 'gallery_id', 'price', 'shipment_price', 'menu_order', 'visible', 'featured', 'stock', 'seo_title', 'seo_description', 'seo_keywords'], $product->getFillable());
     }
 
     public function testFillablefieldsProductCategoryModel()