Skip to content

J
joshine
Commit d1a7b8c1 by dhn
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents b090b618 bde876b5
Showing with 48 additions and 31 deletions
app/code/Joshine/Banner/view/adminhtml/ui_component/joshine_banner_index_form.xml
...@@ -112,6 +112,34 @@ ...@@ -112,6 +112,34 @@
</field> </field>
<field name="storeviews" formElement="multiselect" class="Magento\Store\Ui\Component\Form\Field\StoreView">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">block</item>
<item name="default" xsi:type="number">0</item>
</item>
</argument>
<settings>
<validation>
<rule name="required-entry" xsi:type="boolean">true</rule>
</validation>
<dataType>int</dataType>
<tooltip>
<link>https://docs.magento.com/user-guide/configuration/scope.html</link>
<description>What is this?</description>
</tooltip>
<label translate="true">Store View</label>
<dataScope>store_id</dataScope>
</settings>
<formElements>
<multiselect>
<settings>
<options class="Magento\Cms\Ui\Component\Listing\Column\Cms\Options"/>
</settings>
</multiselect>
</formElements>
</field>
<field name="url" sortOrder="30" formElement="input"> <field name="url" sortOrder="30" formElement="input">
<argument name="data" xsi:type="array"> <argument name="data" xsi:type="array">
...@@ -195,4 +223,6 @@ ...@@ -195,4 +223,6 @@
</fieldset> </fieldset>
</form> </form>
\ No newline at end of file
app/code/Joshine/Banner/view/adminhtml/ui_component/joshine_banner_index_listing.xml
...@@ -95,19 +95,6 @@ ...@@ -95,19 +95,6 @@
</argument> </argument>
</column> </column>
<column name="desc">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Description</item>
<item name="resizeEnabled" xsi:type="boolean">true</item>
<item name="resizeDefaultWidth" xsi:type="string">60</item>
<item name="fieldClass" xsi:type="string">col3</item>
</item>
</argument>
</column>
<column name="url"> <column name="url">
<argument name="data" xsi:type="array"> <argument name="data" xsi:type="array">
<item name="config" xsi:type="array"> <item name="config" xsi:type="array">
......
app/code/Joshine/Script/Console/Command/ReviewsImporter.php
...@@ -14,6 +14,7 @@ use Magento\Framework\Exception\NoSuchEntityException; ...@@ -14,6 +14,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\File\Csv; use Magento\Framework\File\Csv;
use Magento\Framework\ObjectManager\ObjectManager; use Magento\Framework\ObjectManager\ObjectManager;
use Magento\Setup\Exception; use Magento\Setup\Exception;
use Magento\Store\Model\App\Emulation;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
...@@ -166,12 +167,12 @@ class ReviewsImporter extends Command ...@@ -166,12 +167,12 @@ class ReviewsImporter extends Command
return; return;
} }
$storeId = $input->getOption('store_id'); $store_id = $input->getOption('store_id');
if (!$storeId) { if (!$store_id) {
$output->writeln($this->errorWrapper("store_id没填")); $output->writeln($this->errorWrapper("store_id没填"));
return; return;
} }
$this->storeId = $storeId; $this->storeId = $store_id;
$this->importCsvFile($path); $this->importCsvFile($path);
} catch (\Exception $e) { } catch (\Exception $e) {
$output->writeln($this->errorWrapper($e->getMessage())); $output->writeln($this->errorWrapper($e->getMessage()));
...@@ -192,6 +193,7 @@ class ReviewsImporter extends Command ...@@ -192,6 +193,7 @@ class ReviewsImporter extends Command
private function insertDB($data) private function insertDB($data)
{ {
$objectManager = \Magento\Framework\App\ObjectManager::getInstance(); $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$reviewFactory = $objectManager->get("Magento\Review\Model\ReviewFactory"); $reviewFactory = $objectManager->get("Magento\Review\Model\ReviewFactory");
$ratingFactory = $objectManager->get("Magento\Review\Model\RatingFactory"); $ratingFactory = $objectManager->get("Magento\Review\Model\RatingFactory");
...@@ -319,21 +321,15 @@ class ReviewsImporter extends Command ...@@ -319,21 +321,15 @@ class ReviewsImporter extends Command
$review['size_fits'] = trim($row[6]); $review['size_fits'] = trim($row[6]);
$review['date'] = trim($row[7]); $review['date'] = trim($row[7]);
if (empty(trim($review["sku"])) if (empty(trim($review["sku"]))
|| empty(trim($review["detail"]) || empty(trim($review["detail"]))
|| empty(trim($review['nickname'])) || empty(trim($review['nickname']))
|| empty($review['date']) || empty($review['date'])
|| empty($review['title']) || empty($review['title']
|| empty($review['size_fits'])
|| empty($review['ratings'])
) )
) { ) {
throw new \Exception("表格数据有空: {$row["name"]}"); throw new \Exception("表格数据有空!");
}
if (!is_integer($review['size_fits'])) {
$review['size_fits'] = 3;
}
if (!is_integer($review['ratings'])) {
$review['ratings'] = 5;
} }
$data[] = $review; $data[] = $review;
} }
......
app/design/frontend/Joshine/breeze/etc/view.xml
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
</vars> </vars>
<!-- Bundles are always generated by Magento regardless of config value --> <!-- Bundles are always generated by Magento regardless of config value -->
<vars module="Js_Bundle"> <vars module="Js_Bundle">
<var name="bundle_size">2MB</var> <var name="bundle_size">1MB</var>
</vars> </vars>
<exclude> <exclude>
<item type="file">Lib::chartjs/Chart.min.js</item> <item type="file">Lib::chartjs/Chart.min.js</item>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -2373,7 +2373,7 @@ button.action.submit.primary { ...@@ -2373,7 +2373,7 @@ button.action.submit.primary {
} }
} }
.product-info-main .swatch-option.color, .swatch-option.image{ .product-info-main .swatch-option.color{
margin-right: 10px !important; margin-right: 10px !important;
} }
......
pub/.htaccess
...@@ -135,8 +135,12 @@ ...@@ -135,8 +135,12 @@
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
############################################ ############################################
## TRACE and TRACK HTTP methods disabled to prevent XSS attacks
RewriteRule ^static/version[^/]+/(.*)$ static/$1 [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^static/(version[^/]+/)?(.*)$ static.php?resource=$2 [L]
## TRACE and TRACK HTTP methods disabled to prevent XSS attacks
RewriteCond %{REQUEST_METHOD} ^TRAC[EK] RewriteCond %{REQUEST_METHOD} ^TRAC[EK]
RewriteRule .* - [L,R=405] RewriteRule .* - [L,R=405]
...@@ -161,7 +165,6 @@ ...@@ -161,7 +165,6 @@
</IfModule> </IfModule>
############################################ ############################################
## Prevent character encoding issues from server overrides ## Prevent character encoding issues from server overrides
## If you still have problems, use the second line instead ## If you still have problems, use the second line instead
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment