Update 1.0.1-dev

Adding more integreation with Shopify EASDK.
multidimension-al · Dec 17, 2016 · 8f62842 · 8f62842
1 parent 89af7b2
commit 8f62842
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -21,13 +21,13 @@ composer require --prefer-dist multidimensional/cakephp-seaff
 Load the plugin by running following command in terminal:
 
 ```
-bin/cake plugin load Seaff
+bin/cake plugin load Multidimensional/Seaff
 ```
 
 Or by manually adding following line to your app's `config/bootstrap.php`:
 
 ```php
-Plugin::load('Seaff');
+Plugin::load('Multidimensional/Seaff');
 ```
 
 ## Usage
@@ -37,14 +37,14 @@ Add this in your Controller (requires CakePHP 3.1 or newer):
 ```php
 public function beforeRender(\Cake\Event\Event $event)
 {
-	$this->viewBuilder()->theme('Seaff');
+	$this->viewBuilder()->theme('Multidimensional/Seaff');
 }
 ```
 
 If using a version prior to 3.1, you can set the Theme using the following in your controller.
 
 ```php
-public $theme = 'Seaff';
+public $theme = 'Multidimensional/Seaff';
 ```
 
 For more information about Themes, see this [page](http://book.cakephp.org/3.0/en/views/themes.html).

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "multidimensional/cakephp-seaff",
 	"description": "Shopify Embedded App Frontend Framework (SEAFF) for CakePHP",
-	"version": "1.0.0",
+	"version": "1.0.1-dev",
 	"type": "cakephp-plugin",
 	"keywords": ["cakephp", "cakephp3", "shopify"],
 	"homepage": "https://github.com/multidimension-al/cakephp-seaff",
@@ -15,11 +15,12 @@
 		"role": "Developer"
 	}],
 	"require": {
-		"cakephp/cakephp": "~3"
+		"cakephp/cakephp": "~3",
+		"multidimensional/cakephpify": "*"
 	},
 	"autoload": {
 		"psr-4": {
-			"Seaff\\": "src"
+			"Multidimensional\\Seaff\\": "src"
 		}
 	}
 }
diff --git a/src/Template/Element/Flash/default.ctp b/src/Template/Element/Flash/default.ctp
@@ -0,0 +1,13 @@
+<?php
+
+if (!empty($params['class']) && ((is_array($params['class']) && in_array('error', $params['class'])) || (strpos($params['class'], 'error') !== FALSE))) {
+    $type = "Error";
+} else {
+	$type = "Notice";	
+}
+if (!isset($params['escape']) || $params['escape'] !== false) {
+    $message = h($message);
+}
+?>
+<script type="text/javascript">ShopifyApp.flash<?= $type ?>("<?= $message ?>");</script>
+
diff --git a/src/Template/Element/Flash/error.ctp b/src/Template/Element/Flash/error.ctp
@@ -0,0 +1,7 @@
+<?php
+if (!isset($params['escape']) || $params['escape'] !== false) {
+    $message = h($message);
+}
+?>
+<script type="text/javascript">ShopifyApp.flashError("<?= $message ?>");</script>
+
diff --git a/src/Template/Element/Flash/success.ctp b/src/Template/Element/Flash/success.ctp
@@ -0,0 +1,7 @@
+<?php
+if (!isset($params['escape']) || $params['escape'] !== false) {
+    $message = h($message);
+}
+?>
+<script type="text/javascript">ShopifyApp.flashNotice("<?= $message ?>");</script>
+
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
@@ -6,6 +6,13 @@
     <?= $this->fetch('meta'); ?>
     <?= $this->Html->css('seaff.min.css'); ?>
     <?= $this->fetch('css'); ?>
+	<script src="https://cdn.shopify.com/s/assets/external/app.js?<?= date("YmdH"); ?>"></script>
+	<script type="text/javascript">
+	ShopifyApp.init({
+		apiKey: '<?= h($shopifyAPIkey); ?>',
+		shopOrigin: 'https://<?= h($shopifyShopDomain); ?>'
+	});
+	</script>
     <?= $this->fetch('script'); ?>
 </head>
 <body>

diff --git a/src/View/SeaffView.php b/src/View/SeaffView.php
@@ -0,0 +1,30 @@
+<?php
+namespace Multidimensional\Seaff\View;
+
+use Cake\View\View;
+use \Cake\Event\Event;
+
+class SeaffView extends View
+{
+
+	public function initialize()
+    {
+        parent::initialize();
+
+	}
+
+	public function	beforeRender(Event $event)
+    {
+        parent::beforeRender($event);
+		$this->set('shopifyAPIkey', '');
+		$this->set('shopifyShopDomain', '');
+
+	}
+
+    public function render($view = null, $layout = null)
+    {
+
+
+
+    }
+}