diff --git a/app/Datatables/Shop/OffersDataTable.php b/app/Datatables/Shop/OffersDataTable.php
index d027b967..227e1ffe 100644
--- a/app/Datatables/Shop/OffersDataTable.php
+++ b/app/Datatables/Shop/OffersDataTable.php
@@ -8,7 +8,7 @@ use App\Models\Shop\Offer;
 
 class OffersDataTable extends DataTable
 {
-    public $model_name = 'tariffs';
+    public $model_name = 'offers';
 
     public function query(Offer $model)
     {
diff --git a/app/Http/Controllers/Admin/Shop/OfferController.php b/app/Http/Controllers/Admin/Shop/OfferController.php
index d1b05ba4..44bd1abf 100644
--- a/app/Http/Controllers/Admin/Shop/OfferController.php
+++ b/app/Http/Controllers/Admin/Shop/OfferController.php
@@ -26,26 +26,28 @@ class OfferController extends Controller
         return view('Admin.Shop.Offers.create', $data);
     }
 
+    public function edit($id)
+    {
+        $data['offer'] = Offers::get($id)->toArray();
+        $data['articles'] = Articles::getOptions();
+        $data['tariffs'] = Tariffs::getOptions();
+        $data['variations'] = Variations::getOptions();
+        return view('Admin.Shop.Offers.edit', $data);
+    }
+
     public function store(Request $request)
     {
-        dump($request->all());
-        exit;
-        $ret = Offers::store($request->all());
+        $data = $request->all();
+        $ret = Offers::store($data);
         return redirect()->route('Admin.Shop.Offers.index');
     }
 
     public function show($id)
     {
-        $data = Offers::get($id);
+        $data['offer'] = Offers::get($id)->toArray();
         return view('Admin.Shop.Offers.view', $data);
     }
 
-    public function edit($id)
-    {
-        $data['customer'] = Offers::get($id)->toArray();
-        return view('Admin.Shop.Offers.edit', $data);
-    }
-
     public function destroy($id)
     {
         return Offers::destroy($id);
diff --git a/resources/views/Admin/Shop/Offers/edit.blade.php b/resources/views/Admin/Shop/Offers/edit.blade.php
index 97b3a6bd..928f3118 100644
--- a/resources/views/Admin/Shop/Offers/edit.blade.php
+++ b/resources/views/Admin/Shop/Offers/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
 
 	{{ Form::open(['route' => 'Admin.Shop.Offers.store', 'id' => 'offer-form', 'autocomplete' => 'off']) }}
-		<input type="hidden" name="id" value="{{ $id }}">
+		<input type="hidden" name="id" value="{{ $offer['id'] }}">
 		@include('Admin.Shop.Offers.form')
 	</form>
 
diff --git a/resources/views/Admin/Shop/Offers/form.blade.php b/resources/views/Admin/Shop/Offers/form.blade.php
index 62699662..1a8d38bc 100644
--- a/resources/views/Admin/Shop/Offers/form.blade.php
+++ b/resources/views/Admin/Shop/Offers/form.blade.php
@@ -70,36 +70,57 @@
 	<script>
 		function handleArticle() {
 			$('.select_article').change(function() {
-				var url = '{{ route('Admin.Shop.Offers.previewArticle') }}/' + $(this).val();
-				$('#preview-article').load(url, function() {
-					initChevron();
-				});
+				previewArticle($(this).val());
 			})
 		}
 
+		function previewArticle(id) {
+			var url = '{{ route('Admin.Shop.Offers.previewArticle') }}/' + id;
+			$('#preview-article').load(url, function() {
+				initChevron();
+			});
+		}
+
 		function handleVariation() {
 			$('.select_variation').change(function() {
-				var url = '{{ route('Admin.Shop.Offers.previewVariation') }}/' + $(this).val();
-				$('#preview-variation').load(url, function() {
-					initChevron();
-				});
+				previewVariation($(this).val());
 			})
 		}
 
+		function previewVariation(id) {
+			var url = '{{ route('Admin.Shop.Offers.previewVariation') }}/' + id;
+			$('#preview-variation').load(url, function() {
+				initChevron();
+			});
+		}
+
 		function handleTariff() {
 			$('.select_tariffs').change(function() {
-				var url = '{{ route('Admin.Shop.Offers.previewTariff') }}/' + $(this).val();
-				$('#preview-tariff').load(url, function() {
-					initChevron();
-				});
+				previewTariff($(this).val());
 			})
 		}
 
+		function previewTariff(id) {
+			var url = '{{ route('Admin.Shop.Offers.previewTariff') }}/' + id;
+			$('#preview-tariff').load(url, function() {
+				initChevron();
+			});
+		}
+
+		function initPreview() {
+			previewArticle("{{ $offer['article_id'] ?? null }}");
+			previewVariation("{{ $offer['variation_id'] ?? null }}");
+			previewTariff("{{ $offer['tariff_id'] ?? null }}");
+		}
+
 		handleArticle();
 		handleVariation();
 		handleTariff();
 		initChevron();
-		initSaveForm();
+		initSaveForm('#offer-form');
 		initSelect2();
+		@if ($offer['id'] ?? false)
+			initPreview();
+		@endif
 	</script>
 @endpush
\ No newline at end of file