Initial order status change

magespecialist · Oct 25, 2017 · aad28f4 · aad28f4
1 parent 423b90e
commit aad28f4
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/Model/Cashondelivery.php b/Model/Cashondelivery.php
@@ -136,7 +136,6 @@ public function getCartInformation()
         return $this->objectManagerInterface->get('MSP\CashOnDelivery\Api\CashondeliveryCartInterface');
     }
 
-
     /**
      * @return \Magento\Tax\Api\Data\TaxRateInterface
      */

diff --git a/Model/CashondeliveryTable.php b/Model/CashondeliveryTable.php
@@ -150,7 +150,6 @@ public function saveFromFile($fileName)
             for ($i=0; $i<count($headers); $i++) {
             // @codingStandardsIgnoreEnd
                 foreach ($this->_columns as $columnName) {
-
                     // Optional columns
                     if ($columnName == 'website') {
                         if (!isset($csvLine[$columnsMap[$columnName]]) || !$csvLine[$columnsMap[$columnName]]) {
@@ -164,8 +163,7 @@ public function saveFromFile($fileName)
                     if ($columnName == 'fee') {
                         $dataRow['is_pct'] = (strpos($value, '%') !== false);
                         $value = floatval(str_replace('%', '', $value));
-
-                    } else if ($columnName == 'from_amount') {
+                    } elseif ($columnName == 'from_amount') {
                         $value = floatval($value);
                     }
 

diff --git a/Model/Payment.php b/Model/Payment.php
@@ -42,7 +42,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
 
         $excludeRegions = $this->_scopeConfig->getValue(static::XML_PATH_EXCLUDE_REGIONS);
 
-        if(!empty($excludeRegions)) {
+        if (!empty($excludeRegions)) {
             $excludeRegions = explode(',', $excludeRegions);
             foreach ($quote->getAllShippingAddresses() as $shippingAddress) {
                 if (in_array($shippingAddress->getRegionId(), $excludeRegions)) {

diff --git a/Model/ResourceModel/Order/Collection.php b/Model/ResourceModel/Order/Collection.php
@@ -119,7 +119,7 @@ public function __construct(
 
     /**
      * Get sales amount expression
-     * Here i added the last to arguments to the expression 
+     * Here i added the last to arguments to the expression
      * to subtract the cash on deliry and the tax amount form the total revenue
      *
      * @return string
@@ -156,5 +156,4 @@ protected function _getSalesAmountExpression()
 
         return $this->_salesAmountExpression;
     }
-
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -36,7 +36,7 @@
                 </field>
                 <field id="order_status" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>New Order Status</label>
-                    <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
+                    <source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
                 </field>
                 <field id="allowspecific" translate="label" type="allowspecific" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment from Applicable Countries</label>

diff --git a/etc/module.xml b/etc/module.xml
@@ -21,7 +21,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MSP_CashOnDelivery" setup_version="1.2.6">
+    <module name="MSP_CashOnDelivery" setup_version="1.2.7">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />