diff --git a/app/appadmin/languages/zh-CN/appadmin.php b/app/appadmin/languages/zh-CN/appadmin.php index a9f9bd8f0..d92ccfe59 100755 --- a/app/appadmin/languages/zh-CN/appadmin.php +++ b/app/appadmin/languages/zh-CN/appadmin.php @@ -880,6 +880,10 @@ 'canceled' => '已取消', 'Cart & Coupon' => '购物车&优惠券', 'Admin Url Key Sql Gii' => '后台菜单Sql Gii', + 'Third Collection' => '第三方采集', + 'Third Refer Url' => '外部来源', + 'Third Refer Code' => '外部编码', + 'Third Product Code' => '第三方货号', '' => '', '' => '', '' => '', @@ -887,6 +891,23 @@ '' => '', '' => '', '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + diff --git a/app/appadmin/modules/Catalog/block/productinfo/Index.php b/app/appadmin/modules/Catalog/block/productinfo/Index.php index ecb65e3f3..e1cf8b5de 100644 --- a/app/appadmin/modules/Catalog/block/productinfo/Index.php +++ b/app/appadmin/modules/Catalog/block/productinfo/Index.php @@ -426,6 +426,8 @@ public function getEditBar()
  • ' . Yii::$service->page->translate->__('Batch Add') . '
  • ' . Yii::$service->page->translate->__('Update') . '
  • ' . Yii::$service->page->translate->__('Batch Delete') . '
  • - '; +
  • 批量采集商品
  • + + '; } } diff --git a/app/appadmin/modules/Catalog/block/productinfo/Managerbatchedit.php b/app/appadmin/modules/Catalog/block/productinfo/Managerbatchedit.php index 01cbb8daa..2a0e11dc1 100644 --- a/app/appadmin/modules/Catalog/block/productinfo/Managerbatchedit.php +++ b/app/appadmin/modules/Catalog/block/productinfo/Managerbatchedit.php @@ -93,6 +93,7 @@ public function getLastData() 'custom_option_img' => $this->getCustomOpImgHtml(), 'custom_option_list'=> $this->_custom_option_list_str, 'relation' => $this->getRelationInfo(), + 'thirdInfo' => $this->getThirdDataInfo(), ]; } @@ -174,6 +175,16 @@ public function getRelationInfo() return $this->_lang_attr.$editBar.$this->_textareas; } + + public function getThirdDataInfo() + { + $this->_lang_attr = ''; + $this->_textareas = ''; + $editArr = $this->_attr->getThirdDataInfo(); + $editBar = $this->getEditBar($editArr); + + return $this->_lang_attr.$editBar.$this->_textareas; + } public function getBaseInfo() { diff --git a/app/appadmin/modules/Catalog/block/productinfo/Manageredit.php b/app/appadmin/modules/Catalog/block/productinfo/Manageredit.php index 0c988ed3f..d05e15115 100644 --- a/app/appadmin/modules/Catalog/block/productinfo/Manageredit.php +++ b/app/appadmin/modules/Catalog/block/productinfo/Manageredit.php @@ -92,6 +92,7 @@ public function getLastData() 'custom_option_img' => $this->getCustomOpImgHtml(), 'custom_option_list'=> $this->_custom_option_list_str, 'relation' => $this->getRelationInfo(), + 'thirdInfo' => $this->getThirdDataInfo(), ]; } @@ -173,7 +174,18 @@ public function getRelationInfo() return $this->_lang_attr.$editBar.$this->_textareas; } + + + public function getThirdDataInfo() + { + $this->_lang_attr = ''; + $this->_textareas = ''; + $editArr = $this->_attr->getThirdDataInfo(); + $editBar = $this->getEditBar($editArr); + return $this->_lang_attr.$editBar.$this->_textareas; + } + public function getBaseInfo() { $this->_lang_attr = ''; diff --git a/app/appadmin/modules/Catalog/block/productinfo/index/Attr.php b/app/appadmin/modules/Catalog/block/productinfo/index/Attr.php index 4aa68b0d3..0a3c35563 100644 --- a/app/appadmin/modules/Catalog/block/productinfo/index/Attr.php +++ b/app/appadmin/modules/Catalog/block/productinfo/index/Attr.php @@ -116,6 +116,38 @@ public function getRelationInfo() ]; } + + public function getThirdDataInfo() + { + return [ + [ + 'label' => Yii::$service->page->translate->__('Third Refer Url'), + 'name' => 'third_refer_url', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + [ + 'label' => Yii::$service->page->translate->__('Third Refer Code'), + 'name' => 'third_refer_code', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + [ + 'label' => Yii::$service->page->translate->__('Third Product Code'), + 'name' => 'third_product_code', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + + ]; + } + public function getBaseInfo() { diff --git a/app/appadmin/modules/Catalog/block/productinfo/index/BatchAttr.php b/app/appadmin/modules/Catalog/block/productinfo/index/BatchAttr.php index 2a91defc2..0976d12d5 100644 --- a/app/appadmin/modules/Catalog/block/productinfo/index/BatchAttr.php +++ b/app/appadmin/modules/Catalog/block/productinfo/index/BatchAttr.php @@ -116,7 +116,38 @@ public function getRelationInfo() ]; } + + public function getThirdDataInfo() + { + return [ + [ + 'label' => Yii::$service->page->translate->__('Third Refer Url'), + 'name' => 'third_refer_url', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + [ + 'label' => Yii::$service->page->translate->__('Third Refer Code'), + 'name' => 'third_refer_code', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + [ + 'label' => Yii::$service->page->translate->__('Third Product Code'), + 'name' => 'third_product_code', + 'display' => [ + 'type' => 'inputString', + ], + 'require' => 0, + ], + ]; + } + public function getBaseInfo() { return [ diff --git a/app/appadmin/theme/base/default/catalog/productinfo/managerbatchedit.php b/app/appadmin/theme/base/default/catalog/productinfo/managerbatchedit.php index 3cb869915..b24500a0c 100644 --- a/app/appadmin/theme/base/default/catalog/productinfo/managerbatchedit.php +++ b/app/appadmin/theme/base/default/catalog/productinfo/managerbatchedit.php @@ -255,7 +255,9 @@ function thissubmit(thiss){
  • page->translate->__('Relate Product') ?>
  • - +
  • page->translate->__('Third Collection') ?>
  • + +
    @@ -607,7 +609,10 @@ function getTableStr(attrArr, i, hStr) {
    - + +
    +
    +
    diff --git a/app/appadmin/theme/base/default/catalog/productinfo/manageredit.php b/app/appadmin/theme/base/default/catalog/productinfo/manageredit.php index d0fe27d41..c784e4c61 100644 --- a/app/appadmin/theme/base/default/catalog/productinfo/manageredit.php +++ b/app/appadmin/theme/base/default/catalog/productinfo/manageredit.php @@ -213,7 +213,9 @@ function thissubmit(thiss){
  • page->translate->__('Relate Product') ?>
  • - +
  • page->translate->__('Third Collection') ?>
  • + +
    @@ -393,6 +395,9 @@ function thissubmit(thiss){
    +
    + +