Add DomainRegistrationProduct, add validation to DomainCheck

hiqdev · Nov 4, 2015 · bc15164 · bc15164
1 parent 57a44d3
commit bc15164
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/src/controllers/DomainController.php b/src/controllers/DomainController.php
@@ -301,7 +301,7 @@ public function actionCheckDomain()
             ->andFilterWhere(['type' => 'domain'])
             ->andFilterWhere(['seller' => 'ahnames'])
             ->one();
-        $zones = array_filter($tariffs->resources, function($resource) {
+        $zones = array_filter($tariffs->resources ? : [], function($resource) {
             return ($resource->zone != null && $resource->type == Resource::TYPE_DOMAIN_REGISTRATION);
         });
         $dropDownZones = [];

diff --git a/src/models/Domain.php b/src/models/Domain.php
@@ -52,6 +52,7 @@ public function rules () {
 
             // Check domain
             [['domain'], DomainPartValidator::className(), 'on' => ['check-domain']],
+            [['domain', 'zone'], 'required', 'on' => ['check-domain']],
             [['zone'], 'safe', 'on' => ['check-domain']],
             [['zone'], 'trim', 'on' => ['check-domain']],
             [['is_available'], 'boolean', 'on' => ['check-domain']],

diff --git a/src/models/DomainProduct.php b/src/models/DomainProduct.php
@@ -3,6 +3,7 @@
 namespace hipanel\modules\domain\models;
 
 use hipanel\models\CartPosition;
+use Yii;
 
 class DomainProduct extends CartPosition
 {
@@ -12,4 +13,14 @@ class DomainProduct extends CartPosition
     public $model;
 
     public $icon = '<i class="fa fa-globe"></i>'; //'<i class="fa fa-server text-muted"></i>';
+
+    public function getQuantityOptions()
+    {
+        $result = [];
+        foreach ([1,2,3,4,5,6,7,8,9,10] as $n) {
+            $result[$n] = Yii::t('app', '{0, plural, one{# year} other{# years}}', $n);
+        }
+
+        return $result;
+    }
 }
diff --git a/src/models/DomainRegistrationProduct.php b/src/models/DomainRegistrationProduct.php
@@ -6,6 +6,8 @@
 
 class DomainRegistrationProduct extends DomainProduct
 {
+    protected $_operation = 'registration';
+
     public function getId()
     {
         return implode('_', ['domain', 'registration', $this->name]);

diff --git a/src/models/DomainRenewalProduct.php b/src/models/DomainRenewalProduct.php
@@ -23,14 +23,4 @@ public function getId()
     {
         return implode('_', ['domain', 'renewal', $this->_model->id]);
     }
-
-    public function getQuantityOptions()
-    {
-        $result = [];
-        foreach ([1,2,3,4,5,6,7,8,9,10] as $n) {
-            $result[$n] = Yii::t('app', '{0, plural, one{# year} other{# years}}', $n);
-        }
-
-        return $result;
-    }
 }
diff --git a/src/views/domain/checkDomain.php b/src/views/domain/checkDomain.php
@@ -98,20 +98,20 @@ function Plugin(element, options) {
     };
 })(jQuery, window, document);
 
-jQuery(document).on('pjax:complete', function() {
-    $('.domainsCheck').domainsCheck({
-        domainRowClass: '.check-item',
-        success: function(data, domain, element) {
-            console.log('123');
-            var $elem = $(element).find("tr[data-domain='" + domain + "']");
-            $elem.html(data);
-            return this;
-        },
-        finally: function() {
-            console.log('finally');
-        }
-    });
-});
+//jQuery(document).on('pjax:complete', function() {
+//    $('.domainsCheck').domainsCheck({
+//        domainRowClass: '.check-item',
+//        success: function(data, domain, element) {
+//            console.log('123');
+//            var $elem = $(element).find("tr[data-domain='" + domain + "']");
+//            $elem.html(data);
+//            return this;
+//        },
+//        finally: function() {
+//            console.log('finally');
+//        }
+//    });
+//});
 JS
 );
 ?>