2.2.0-pl

argnist · Jul 16, 2015 · 60eae2a · 60eae2a
1 parent dc0c613
commit 60eae2a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/_build/build.config.php b/_build/build.config.php
@@ -5,7 +5,7 @@
 define('PKG_NAME_LOWER', strtolower(PKG_NAME));
 
 define('PKG_VERSION', '2.2.0');
-define('PKG_RELEASE', 'beta4');
+define('PKG_RELEASE', 'pl');
 define('PKG_AUTO_INSTALL', true);
 
 /* define paths */

diff --git a/_build/resolvers/resolve.tables.php b/_build/resolvers/resolve.tables.php
@@ -16,10 +16,6 @@
 			$modelPath = $modx->getOption('minishop2.core_path',null,$modx->getOption('core_path').'components/minishop2/').'model/';
 			$modx->addPackage('minishop2',$modelPath);
 
-            $prefix = $modx->getOption(xPDO::OPT_TABLE_PREFIX, null, '');
-            $modx->exec("RENAME TABLE {$prefix}ms3_category_options TO {$prefix}ms2_category_options;");
-            $modx->exec("RENAME TABLE {$prefix}ms3_options TO {$prefix}ms2_options;");
-
 			$manager = $modx->getManager();
 			$tmp = array(
 				'msProductData',

diff --git a/assets/components/minishop2/js/mgr/minishop2.js b/assets/components/minishop2/js/mgr/minishop2.js
@@ -4,6 +4,17 @@ var miniShop2 = function(config) {
 };
 Ext.extend(miniShop2,Ext.Component,{
 	page:{},window:{},grid:{},tree:{},panel:{},combo:{},config:{},view:{},keymap:{}, plugin:{}
+
+    ,getOptCaption: function(field) {
+        var opts = miniShop2.config.option_fields;
+        if (!opts) return '';
+        for (var i= 0, len = opts.length; i<len; i++) {
+            if (opts[i]['key'] == field) {
+                return opts[i]['caption'];
+            }
+        }
+        return '';
+    }
 });
 Ext.reg('minishop2',miniShop2);
 

diff --git a/assets/components/minishop2/js/mgr/product/product.common.js b/assets/components/minishop2/js/mgr/product/product.common.js
@@ -329,13 +329,13 @@ var methods = {
     ,getExtField: function(config, field, tmp) {
 
         var help = _('resource_'+field+'_help') ? '<br />'+_('resource_'+field+'_help') : '';
+        tmp.value = tmp.value || config.record[field];
         var properties = {
             description: '<b>[[*'+field+']]</b>'+help
             ,enableKeyEvents: true
             ,listeners: config.listeners
             ,name: field
             ,id: 'modx-resource-'+field
-            ,value: tmp.value || config.record[field]
             ,msgTarget: 'under'
         };
         if (tmp.allowBlank === false) {tmp.fieldLabel = tmp.fieldLabel + ' <span class="required red">*</span>'}

diff --git a/core/components/minishop2/controllers/product/update.class.php b/core/components/minishop2/controllers/product/update.class.php
@@ -21,7 +21,6 @@ public function checkPermissions() {
 		return $this->modx->hasPermission('edit_document');
 	}
 
-
 	/**
 	 * Register custom CSS/JS for the page
 	 * @return void
@@ -165,7 +164,7 @@ public function loadTickets() {
 			// <![CDATA[
 			Tickets.config = {
 				assets_url: "' . $ticketsAssetsUrl . '",
-				connector_url: "' . $connectorUrl . '",
+				connector_url: "' . $connectorUrl . '"
 			};
 			// ]]>
 			</script>');

diff --git a/core/components/minishop2/processors/mgr/product/getoptions.class.php b/core/components/minishop2/processors/mgr/product/getoptions.class.php
@@ -16,7 +16,7 @@ public function process() {
 		$c->groupby('value');
 		$c->where(array('key' => $key));
 		$c->limit($limit);
-		if (!empty($query)) {
+        if (!empty($query)) {
 			$c->where(array('value:LIKE' => "%{$query}%"));
 		}
 		$found = false;