diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..78fb6993 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/vendor +/composer.lock +/.idea +/.vscode +.env +.env.backup diff --git a/Api/AffirmCheckoutManagerInterface.php b/Api/AffirmCheckoutManagerInterface.php index 84ad1491..e264ca44 100644 --- a/Api/AffirmCheckoutManagerInterface.php +++ b/Api/AffirmCheckoutManagerInterface.php @@ -1,27 +1,24 @@ _objectId = 'id'; $this->_controller = 'adminhtml_rule'; - $this->_blockGroup = 'Astound_Affirm'; + $this->_blockGroup = 'Affirm'; parent::_construct(); diff --git a/Block/Adminhtml/Rule/Edit/Form.php b/Block/Adminhtml/Rule/Edit/Form.php index a9f19463..ffe2d05b 100755 --- a/Block/Adminhtml/Rule/Edit/Form.php +++ b/Block/Adminhtml/Rule/Edit/Form.php @@ -1,5 +1,5 @@ _coreRegistry->registry('affirm_payment_restriction_rule'); $om = \Magento\Framework\App\ObjectManager::getInstance(); - $hlp = $om->get('Astound\Affirm\Helper\Data'); + $hlp = $om->get('Affirm\Helper\Data'); $form = $this->_formFactory->create(); diff --git a/Block/Adminhtml/Rule/Edit/Tab/General.php b/Block/Adminhtml/Rule/Edit/Tab/General.php index 078fd83f..79a7d8cd 100755 --- a/Block/Adminhtml/Rule/Edit/Tab/General.php +++ b/Block/Adminhtml/Rule/Edit/Tab/General.php @@ -1,6 +1,6 @@ _coreRegistry->registry('affirm_payment_restriction_rule'); $om = \Magento\Framework\App\ObjectManager::getInstance(); - $hlp = $om->get('Astound\Affirm\Helper\Data'); + $hlp = $om->get('Affirm\Helper\Data'); $form = $this->_formFactory->create(); $form->setHtmlIdPrefix('rule_'); diff --git a/Block/Adminhtml/Rule/Edit/Tabs.php b/Block/Adminhtml/Rule/Edit/Tabs.php index aa57718f..a018b3cb 100755 --- a/Block/Adminhtml/Rule/Edit/Tabs.php +++ b/Block/Adminhtml/Rule/Edit/Tabs.php @@ -1,5 +1,5 @@ get('Astound\Affirm\Helper\Data'); + $hlp = $om->get('Affirm\Helper\Data'); $groups = $row->getData('cust_groups'); if (!$groups) { return __('Restricts For All'); diff --git a/Block/Adminhtml/Rule/Grid/Renderer/Methods.php b/Block/Adminhtml/Rule/Grid/Renderer/Methods.php index a63f4e39..59f2023c 100755 --- a/Block/Adminhtml/Rule/Grid/Renderer/Methods.php +++ b/Block/Adminhtml/Rule/Grid/Renderer/Methods.php @@ -1,12 +1,12 @@ get('Astound\Affirm\Helper\Data'); + $hlp = $om->get('Affirm\Helper\Data'); $v = $row->getData('methods'); if (!$v) { diff --git a/Block/Adminhtml/Rule/Grid/Renderer/Stores.php b/Block/Adminhtml/Rule/Grid/Renderer/Stores.php index 30552347..6fbe418c 100755 --- a/Block/Adminhtml/Rule/Grid/Renderer/Stores.php +++ b/Block/Adminhtml/Rule/Grid/Renderer/Stores.php @@ -1,11 +1,11 @@ get('Astound\Affirm\Helper\Data'); + $hlp = $om->get('Affirm\Helper\Data'); $sys = $om->get('Magento\Store\Model\System\Store'); $stores = $row->getData('stores'); if (!$stores) { diff --git a/Block/Info.php b/Block/Info.php index c6b89ba9..0352ebeb 100644 --- a/Block/Info.php +++ b/Block/Info.php @@ -1,22 +1,19 @@ checkoutSession = $session; diff --git a/Block/Promotion/Pixel/Confirm.php b/Block/Promotion/Pixel/Confirm.php index dd362c6e..3a63b808 100644 --- a/Block/Promotion/Pixel/Confirm.php +++ b/Block/Promotion/Pixel/Confirm.php @@ -33,19 +33,19 @@ * */ -namespace Astound\Affirm\Block\Promotion\Pixel; +namespace Affirm\Block\Promotion\Pixel; use Magento\Store\Model\ScopeInterface; use Magento\Framework\View\Element\Template; -use Astound\Affirm\Model\Ui\ConfigProvider; -use Astound\Affirm\Gateway\Helper\Util; -use Astound\Affirm\Helper\Pixel; -use Astound\Affirm\Logger\Logger; +use Affirm\Model\Ui\ConfigProvider; +use Affirm\Gateway\Helper\Util; +use Affirm\Helper\Pixel; +use Affirm\Logger\Logger; /** * Class Confirm * - * @package Astound\Affirm\Block\Pixel + * @package Affirm\Block\Pixel */ class Confirm extends \Magento\Framework\View\Element\Template { @@ -117,7 +117,7 @@ public function getOrdersTrackingCode() $result['parameter'][2] = $strictBool; - $this->logger->debug('Astound\Affirm\Block\Promotion\Pixel\Confirm::Confirm', $result); + $this->logger->debug('Affirm\Block\Promotion\Pixel\Confirm::Confirm', $result); return $result; } diff --git a/Block/Promotion/ProductPage/Aslowas.php b/Block/Promotion/ProductPage/Aslowas.php index 4dab4ebf..dfe27e05 100644 --- a/Block/Promotion/ProductPage/Aslowas.php +++ b/Block/Promotion/ProductPage/Aslowas.php @@ -1,29 +1,26 @@ moduleResource->getDbVersion('Astound_Affirm'); + return $this->moduleResource->getDbVersion('Affirm'); } } diff --git a/Controller/Adminhtml/Affirm/Error.php b/Controller/Adminhtml/Affirm/Error.php index 96f1ef29..8a11762f 100644 --- a/Controller/Adminhtml/Affirm/Error.php +++ b/Controller/Adminhtml/Affirm/Error.php @@ -1,22 +1,19 @@ _view->loadLayout(); - $this->_setActiveMenu('Astound_Affirm::rule')->_addBreadcrumb(__('Promotions'), __('Promotions')); + $this->_setActiveMenu('Affirm::rule')->_addBreadcrumb(__('Promotions'), __('Promotions')); return $this; } protected function _isAllowed() { - return $this->_authorization->isAllowed('Astound_Affirm::rule'); + return $this->_authorization->isAllowed('Affirm::rule'); } diff --git a/Controller/Adminhtml/Rule/Delete.php b/Controller/Adminhtml/Rule/Delete.php index 209151c8..8e8bd3c4 100755 --- a/Controller/Adminhtml/Rule/Delete.php +++ b/Controller/Adminhtml/Rule/Delete.php @@ -1,15 +1,15 @@ getRequest()->getParam('id'); if ($id) { try { - $model = $this->_objectManager->create('Astound\Affirm\Model\Rule'); + $model = $this->_objectManager->create('Affirm\Model\Rule'); $model->load($id); $model->delete(); $this->messageManager->addSuccess(__('You deleted the item.')); diff --git a/Controller/Adminhtml/Rule/Duplicate.php b/Controller/Adminhtml/Rule/Duplicate.php index f01e352f..10eb61a2 100755 --- a/Controller/Adminhtml/Rule/Duplicate.php +++ b/Controller/Adminhtml/Rule/Duplicate.php @@ -1,6 +1,6 @@ _redirect('*/*'); } try { - $model = $this->_objectManager->create('Astound\Affirm\Model\Rule')->load($id); + $model = $this->_objectManager->create('Affirm\Model\Rule')->load($id); if (!$model->getId()) { $this->messageManager->addError(__('This item no longer exists.')); $this->_redirect('*/*'); diff --git a/Controller/Adminhtml/Rule/Edit.php b/Controller/Adminhtml/Rule/Edit.php index b8e7e7f2..7971b82c 100755 --- a/Controller/Adminhtml/Rule/Edit.php +++ b/Controller/Adminhtml/Rule/Edit.php @@ -1,12 +1,12 @@ getRequest()->getParam('id'); - $model = $this->_objectManager->create('Astound\Affirm\Model\Rule'); + $model = $this->_objectManager->create('Affirm\Model\Rule'); if ($id) { $model->load($id); @@ -34,7 +34,7 @@ public function execute() $this->_view->renderLayout(); } - public function _prepareForEdit(\Astound\Affirm\Model\Rule $model) + public function _prepareForEdit(\Affirm\Model\Rule $model) { $fields = array('stores', 'cust_groups', 'methods'); foreach ($fields as $f){ diff --git a/Controller/Adminhtml/Rule/Index.php b/Controller/Adminhtml/Rule/Index.php index 2c5cc09a..efc5bfaf 100755 --- a/Controller/Adminhtml/Rule/Index.php +++ b/Controller/Adminhtml/Rule/Index.php @@ -1,12 +1,12 @@ resultPageFactory->create(); - $resultPage->setActiveMenu('Astound_Affirm::rule'); + $resultPage->setActiveMenu('Affirm::rule'); $resultPage->getConfig()->getTitle()->prepend(__('Payment Restrictions Rules')); $resultPage->addBreadcrumb(__('Payment Restrictions Rules'), __('Payment Restrictions Rules')); return $resultPage; diff --git a/Controller/Adminhtml/Rule/MassAction.php b/Controller/Adminhtml/Rule/MassAction.php index c54fbdda..33cdd5d3 100755 --- a/Controller/Adminhtml/Rule/MassAction.php +++ b/Controller/Adminhtml/Rule/MassAction.php @@ -1,8 +1,8 @@ _objectManager->create('Astound\Affirm\Model\ResourceModel\Rule\Collection'); + $collection = $this->_objectManager->create('Affirm\Model\ResourceModel\Rule\Collection'); $collection->addFieldToFilter('rule_id', array('in'=>$ids)); $collection->walk($action); @@ -32,7 +32,7 @@ public function execute() } if($status > -1) { - $this->_objectManager->create('Astound\Affirm\Model\Rule')->massChangeStatus($ids, $status); + $this->_objectManager->create('Affirm\Model\Rule')->massChangeStatus($ids, $status); } $this->messageManager->addSuccess($message); diff --git a/Controller/Adminhtml/Rule/NewAction.php b/Controller/Adminhtml/Rule/NewAction.php index d57a4461..7e338ffc 100755 --- a/Controller/Adminhtml/Rule/NewAction.php +++ b/Controller/Adminhtml/Rule/NewAction.php @@ -1,8 +1,8 @@ getRequest()->getPostValue()) { try { - $model = $this->_objectManager->create('Astound\Affirm\Model\Rule'); + $model = $this->_objectManager->create('Affirm\Model\Rule'); $data = $this->getRequest()->getPostValue(); $inputFilter = new \Zend_Filter_Input( [], diff --git a/Controller/Payment/Cancel.php b/Controller/Payment/Cancel.php index ae1dcf9d..997bf5a7 100644 --- a/Controller/Payment/Cancel.php +++ b/Controller/Payment/Cancel.php @@ -1,22 +1,19 @@ config->getValue('mode', $storeId) == 'sandbox' - ? \Astound\Affirm\Model\Config::API_URL_SANDBOX - : \Astound\Affirm\Model\Config::API_URL_PRODUCTION; + ? \Affirm\Model\Config::API_URL_SANDBOX + : \Affirm\Model\Config::API_URL_PRODUCTION; return trim($gateway, '/') . sprintf('%s%s', $this->action, $additionalPath); } diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php index 5848d5d2..cabcca22 100644 --- a/Gateway/Helper/Util.php +++ b/Gateway/Helper/Util.php @@ -1,22 +1,19 @@ logger->debug($log); - $this->affirmLogger->debug('Astound\Affirm\Gateway\Http\Client\ClientService::placeRequest', $log); + $this->affirmLogger->debug('Affirm\Gateway\Http\Client\ClientService::placeRequest', $log); } return $response; diff --git a/Gateway/Http/Converter/JsonToArray.php b/Gateway/Http/Converter/JsonToArray.php index c73ff960..64c8d607 100644 --- a/Gateway/Http/Converter/JsonToArray.php +++ b/Gateway/Http/Converter/JsonToArray.php @@ -1,22 +1,19 @@ _allRules)) { $om = \Magento\Framework\App\ObjectManager::getInstance(); - $hlp = $om->create('Astound\Affirm\Model\Rule'); + $hlp = $om->create('Affirm\Model\Rule'); $this->_allRules = $hlp->getCollection()->addAddressFilter($address)->load(); foreach ($this->_allRules as $rule) { $rule->afterLoad(); diff --git a/Helper/Pixel.php b/Helper/Pixel.php index 5fd6f145..018a962c 100644 --- a/Helper/Pixel.php +++ b/Helper/Pixel.php @@ -33,16 +33,16 @@ * */ -namespace Astound\Affirm\Helper; +namespace Affirm\Helper; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Model\StoreManagerInterface; -use Astound\Affirm\Model\Config as Config; +use Affirm\Model\Config as Config; /** * Pixel helper * - * @package Astound\Affirm\Helper + * @package Affirm\Helper */ class Pixel { diff --git a/Helper/Rule.php b/Helper/Rule.php index 60a8be09..3941c01d 100644 --- a/Helper/Rule.php +++ b/Helper/Rule.php @@ -1,6 +1,6 @@ _allRules)) { $om = \Magento\Framework\App\ObjectManager::getInstance(); - $hlp = $om->create('Astound\Affirm\Model\Rule'); + $hlp = $om->create('Affirm\Model\Rule'); $this->_allRules = $hlp->getCollection()->addFieldToFilter('is_active', 1); $this->_allRules->load(); foreach ($this->_allRules as $rule){ @@ -48,7 +48,7 @@ public function isAslowasAllowedPerRule($position) public function isQuoteItemsDisabledByPaymentRestRules() { foreach ($this->getRules() as $rule){ - if ($rule->restrictByName(\Astound\Affirm\Model\Ui\ConfigProvider::CODE)){ + if ($rule->restrictByName(\Affirm\Model\Ui\ConfigProvider::CODE)){ $om = \Magento\Framework\App\ObjectManager::getInstance(); $checkoutsession = $om->get('Magento\Checkout\Model\Session'); $quote = $checkoutsession->getQuote(); diff --git a/LICENSE b/LICENSE index 732e8d05..cd4d5822 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2018, Affirm +Copyright (c) 2021, Affirm All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Logger/Handler.php b/Logger/Handler.php index 6af04930..7d9d058b 100644 --- a/Logger/Handler.php +++ b/Logger/Handler.php @@ -1,5 +1,5 @@ getMessage(); } finally { - $this->logger->debug('Astound\Affirm\Model\Adminhtml\Observer\AfterShipmentSaveObserver::execute', $log); + $this->logger->debug('Affirm\Model\Adminhtml\Observer\AfterShipmentSaveObserver::execute', $log); } } } @@ -193,8 +190,8 @@ protected function getPublicApiKey() protected function getApiUrl($additionalPath) { $gateway = $this->getIsSandboxMode() - ? \Astound\Affirm\Model\Config::API_URL_SANDBOX - : \Astound\Affirm\Model\Config::API_URL_PRODUCTION; + ? \Affirm\Model\Config::API_URL_SANDBOX + : \Affirm\Model\Config::API_URL_PRODUCTION; return trim($gateway, '/') . sprintf('%s%s', self::API_TRANSACTIONS_PATH, $additionalPath); } diff --git a/Model/Adminhtml/Observer/PredispatchObserver.php b/Model/Adminhtml/Observer/PredispatchObserver.php index 49549e11..7b7a3440 100644 --- a/Model/Adminhtml/Observer/PredispatchObserver.php +++ b/Model/Adminhtml/Observer/PredispatchObserver.php @@ -1,9 +1,9 @@ _backendAuthSession->isLoggedIn()) { $feedModel = $this->_feedFactory->create(); - /* @var $feedModel \Astound|Affirm\Model\Adminhtml|Feed */ + /* @var $feedModel \AffirmAffirm\Model\Adminhtml|Feed */ $feedModel->checkUpdate(); } } diff --git a/Model/Adminhtml/Source/ModeAction.php b/Model/Adminhtml/Source/ModeAction.php index 94af7606..98a48896 100644 --- a/Model/Adminhtml/Source/ModeAction.php +++ b/Model/Adminhtml/Source/ModeAction.php @@ -1,30 +1,27 @@ productMetadata->getEdition() == 'Enterprise') { - $giftWrapperItemsManager = $this->objectManager->create('Astound\Affirm\Api\GiftWrapManagerInterface'); + $giftWrapperItemsManager = $this->objectManager->create('Affirm\Api\GiftWrapManagerInterface'); $wrapped = $giftWrapperItemsManager->getWrapItems(); if ($wrapped) { $response['wrapped_items'] = $wrapped; @@ -234,7 +231,7 @@ public function initCheckout() $response['metadata'] = [ 'platform_type' => $this->productMetadata->getName() . ' 2', 'platform_version' => $this->productMetadata->getVersion() . ' ' . $this->productMetadata->getEdition(), - 'platform_affirm' => $this->moduleResource->getDbVersion('Astound_Affirm'), + 'platform_affirm' => $this->moduleResource->getDbVersion('Affirm'), 'mode' => $this->affirmConfig->getCheckoutFlowType() ]; $financingProgramValue = $this->helper->getFinancingProgramValue(); @@ -243,7 +240,7 @@ public function initCheckout() } $log = []; $log['response'] = $response; - $this->logger->debug('Astound\Affirm\Model\AffirmCheckoutManager::initCheckout', $log); + $this->logger->debug('Affirm\Model\AffirmCheckoutManager::initCheckout', $log); return json_encode($response); } diff --git a/Model/Checkout.php b/Model/Checkout.php index 87b70e12..52cf9cc2 100644 --- a/Model/Checkout.php +++ b/Model/Checkout.php @@ -1,35 +1,32 @@ session->getQuote(); if ($quote->getId()) { $payment = $quote->getPayment(); - $data['method'] = \Astound\Affirm\Model\Ui\ConfigProvider::CODE; + $data['method'] = \Affirm\Model\Ui\ConfigProvider::CODE; $payment->importData($data); $quote->save(); return true; @@ -65,7 +65,7 @@ public function verifyAffirm() $quote = $this->session->getQuote(); if ($quote->getId()) { $payment = $quote->getPayment(); - if ($payment->getData('method') == \Astound\Affirm\Model\Ui\ConfigProvider::CODE) { + if ($payment->getData('method') == \Affirm\Model\Ui\ConfigProvider::CODE) { //Clear data after verification $payment->setData('method', null); return true; diff --git a/Model/Config.php b/Model/Config.php index 47a68c45..1fc21b1a 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -33,7 +33,7 @@ * */ -namespace Astound\Affirm\Model; +namespace Affirm\Model; use Magento\Payment\Model\Method\ConfigInterface; use Magento\Framework\App\Config\ScopeConfigInterface; @@ -45,7 +45,7 @@ /** * Config class * - * @package Astound\Affirm\Model + * @package Affirm\Model */ class Config implements ConfigInterface { @@ -431,7 +431,7 @@ public function isDisabledForBackorderedItems() /** * Aslow as activation flag * - * @param Astound\Affirm\Model\Entity\Attribute\Source\FinancingProgramType$position + * @param Affirm\Model\Entity\Attribute\Source\FinancingProgramType$position * @return int|mixed */ public function isAsLowAsEnabled($position) diff --git a/Model/Config/System/Source/Logo.php b/Model/Config/System/Source/Logo.php index 729de57a..58222772 100644 --- a/Model/Config/System/Source/Logo.php +++ b/Model/Config/System/Source/Logo.php @@ -1,29 +1,26 @@ array( 'platform_type' => $this->productMetadata->getName() . ' 2', 'platform_version' => $this->productMetadata->getVersion() . ' ' . $this->productMetadata->getEdition(), - 'platform_affirm' => $this->moduleResource->getDbVersion('Astound_Affirm'), + 'platform_affirm' => $this->moduleResource->getDbVersion('Affirm'), 'mode' => 'inline' ) ); @@ -131,7 +131,7 @@ public function initInline(){ } if ($this->productMetadata->getEdition() == 'Enterprise') { - $giftWrapperItemsManager = $this->objectManager->create('Astound\Affirm\Api\GiftWrapManagerInterface'); + $giftWrapperItemsManager = $this->objectManager->create('Affirm\Api\GiftWrapManagerInterface'); $wrapped = $giftWrapperItemsManager->getWrapItems(); if ($wrapped) { $checkoutObject['wrapped_items'] = $wrapped; diff --git a/Model/Observer/AddressFormat.php b/Model/Observer/AddressFormat.php index a128d862..b7fbcd3e 100644 --- a/Model/Observer/AddressFormat.php +++ b/Model/Observer/AddressFormat.php @@ -1,22 +1,19 @@ affirmPaymentConfig = $configAffirm; @@ -70,7 +67,7 @@ public function execute(Observer $observer) /** @var \Magento\Payment\Model\Method\Adapter $paymentMethod */ $paymentMethod = $observer->getEvent()->getMethodInstance(); - if ($paymentMethod->getCode() != \Astound\Affirm\Model\Ui\ConfigProvider::CODE) { + if ($paymentMethod->getCode() != \Affirm\Model\Ui\ConfigProvider::CODE) { return; } diff --git a/Model/Observer/SetAffirmAnalyticsOnOrderSuccessPageView.php b/Model/Observer/SetAffirmAnalyticsOnOrderSuccessPageView.php index 90143ac7..e62843cd 100644 --- a/Model/Observer/SetAffirmAnalyticsOnOrderSuccessPageView.php +++ b/Model/Observer/SetAffirmAnalyticsOnOrderSuccessPageView.php @@ -33,7 +33,7 @@ * */ -namespace Astound\Affirm\Model\Observer; +namespace Affirm\Model\Observer; use Magento\Framework\Event\ObserverInterface; use Magento\Framework\Event\Observer; diff --git a/Model/Observer/UpdateFinancingProgramOnLogin.php b/Model/Observer/UpdateFinancingProgramOnLogin.php index b739d2bd..5d0f294b 100644 --- a/Model/Observer/UpdateFinancingProgramOnLogin.php +++ b/Model/Observer/UpdateFinancingProgramOnLogin.php @@ -1,22 +1,19 @@ getWidgetData() . '}\'>'; + $productListHtml .= 'getWidgetData() . '}\'>'; return $productListHtml; } diff --git a/Model/Plugin/Category/ViewAbstract.php b/Model/Plugin/Category/ViewAbstract.php index 3f700647..2bc8c655 100755 --- a/Model/Plugin/Category/ViewAbstract.php +++ b/Model/Plugin/Category/ViewAbstract.php @@ -1,16 +1,16 @@ getMessage(); } finally { - $this->logger->debug('Astound\Affirm\Model\Plugin\Order\AddressSave\Edit::afterExecute', $log); + $this->logger->debug('Affirm\Model\Plugin\Order\AddressSave\Edit::afterExecute', $log); } } @@ -159,8 +156,8 @@ public function afterExecute($controller , $method) protected function getApiUrl($additionalPath) { $gateway = $this->getIsSandboxMode() - ? \Astound\Affirm\Model\Config::API_URL_SANDBOX - : \Astound\Affirm\Model\Config::API_URL_PRODUCTION; + ? \Affirm\Model\Config::API_URL_SANDBOX + : \Affirm\Model\Config::API_URL_PRODUCTION; return trim($gateway, '/') . sprintf('%s%s', self::API_TRANSACTIONS_PATH, $additionalPath); } diff --git a/Model/Plugin/Order/Create.php b/Model/Plugin/Order/Create.php index e584264b..13090047 100644 --- a/Model/Plugin/Order/Create.php +++ b/Model/Plugin/Order/Create.php @@ -1,22 +1,19 @@ getRequest()->getParam('payment'); - if (isset($data['method']) && $data['method'] == \Astound\Affirm\Model\Ui\ConfigProvider::CODE) { + if (isset($data['method']) && $data['method'] == \Affirm\Model\Ui\ConfigProvider::CODE) { $resultRedirect = $this->forwardRedirectFactory->create(); $resultRedirect->setPath('affirm/affirm/error'); return $resultRedirect; diff --git a/Model/Plugin/Order/EditOrder.php b/Model/Plugin/Order/EditOrder.php index 24f2b911..ccb16045 100644 --- a/Model/Plugin/Order/EditOrder.php +++ b/Model/Plugin/Order/EditOrder.php @@ -1,22 +1,19 @@ getRequest()->getParam('payment'); - if (isset($data['method']) && $data['method'] == \Astound\Affirm\Model\Ui\ConfigProvider::CODE) { + if (isset($data['method']) && $data['method'] == \Affirm\Model\Ui\ConfigProvider::CODE) { $resultRedirect = $this->forwardRedirectFactory->create(); $resultRedirect->setPath('affirm/affirm/error'); return $resultRedirect; diff --git a/Model/Plugin/Payment/CanCapturePartial.php b/Model/Plugin/Payment/CanCapturePartial.php index d1ac3dac..3d2890be 100644 --- a/Model/Plugin/Payment/CanCapturePartial.php +++ b/Model/Plugin/Payment/CanCapturePartial.php @@ -2,20 +2,20 @@ /** * * @category Affirm - * @package Astound_Affirm - * @copyright Copyright (c) 2021 Affirm, Inc. + * @package Affirm + * @copyright Copyright (c) 2021 Affirm. * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Astound\Affirm\Model\Plugin\Payment; +namespace Affirm\Model\Plugin\Payment; use Magento\Sales\Model\Order\Payment; -use Astound\Affirm\Model\Config; +use Affirm\Model\Config; /** * Class CanCapturePartial * - * @package Astound\Affirm\Model\Plugin\Payment + * @package Affirm\Model\Plugin\Payment */ class CanCapturePartial { diff --git a/Model/Plugin/Payment/Checks/CanUseForCountry.php b/Model/Plugin/Payment/Checks/CanUseForCountry.php index e76f1fbf..4db77244 100644 --- a/Model/Plugin/Payment/Checks/CanUseForCountry.php +++ b/Model/Plugin/Payment/Checks/CanUseForCountry.php @@ -1,22 +1,19 @@ getCode() == \Astound\Affirm\Model\Ui\ConfigProvider::CODE) { + if ($payment->getCode() == \Affirm\Model\Ui\ConfigProvider::CODE) { if (!$quote->getCustomerId() && $quote->getIsVirtual()) { return false; } diff --git a/Model/Plugin/Product/ListProduct.php b/Model/Plugin/Product/ListProduct.php index c02767d4..3f7645b3 100755 --- a/Model/Plugin/Product/ListProduct.php +++ b/Model/Plugin/Product/ListProduct.php @@ -33,14 +33,14 @@ * */ -namespace Astound\Affirm\Model\Plugin\Product; +namespace Affirm\Model\Plugin\Product; -use Astound\Affirm\Model\Plugin\Category\ViewAbstract; +use Affirm\Model\Plugin\Category\ViewAbstract; /** * Class ListProduct * - * @package Astound\Affirm\Model\Plugin\Product + * @package Affirm\Model\Plugin\Product */ class ListProduct extends ViewAbstract { diff --git a/Model/ResourceModel/Rule.php b/Model/ResourceModel/Rule.php index b4dae8f7..ecd29135 100755 --- a/Model/ResourceModel/Rule.php +++ b/Model/ResourceModel/Rule.php @@ -1,11 +1,11 @@ _init('astound_affirm_rule', 'rule_id'); + $this->_init('Affirm_rule', 'rule_id'); } public function massChangeStatus($ids, $status) @@ -21,7 +21,7 @@ public function massChangeStatus($ids, $status) public function getAttributes() { $db = $this->getConnection(); - $tbl = $this->getTable('astound_affirm_attribute'); + $tbl = $this->getTable('Affirm_attribute'); $select = $db->select()->from($tbl, new \Zend_Db_Expr('DISTINCT code')); return $db->fetchCol($select); @@ -30,7 +30,7 @@ public function getAttributes() public function saveAttributes($id, $attributes) { $db = $this->getConnection(); - $tbl = $this->getTable('astound_affirm_attribute'); + $tbl = $this->getTable('Affirm_attribute'); $db->delete($tbl, array('rule_id=?' => $id)); diff --git a/Model/ResourceModel/Rule/Collection.php b/Model/ResourceModel/Rule/Collection.php index 424a8eb7..493fa185 100755 --- a/Model/ResourceModel/Rule/Collection.php +++ b/Model/ResourceModel/Rule/Collection.php @@ -1,11 +1,11 @@ _init('Astound\Affirm\Model\Rule', 'Astound\Affirm\Model\ResourceModel\Rule'); + $this->_init('Affirm\Model\Rule', 'Affirm\Model\ResourceModel\Rule'); } public function addAddressFilter($address) diff --git a/Model/Rule.php b/Model/Rule.php index 0d6b3db1..9aa0e7a6 100755 --- a/Model/Rule.php +++ b/Model/Rule.php @@ -1,5 +1,5 @@ _init('Astound\Affirm\Model\ResourceModel\Rule'); + $this->_init('Affirm\Model\ResourceModel\Rule'); parent::_construct(); } @@ -47,7 +47,7 @@ public function restrictByName($methodname) public function getConditionsInstance() { - return $this->objectManager->create('Astound\Affirm\Model\Rule\Condition\Combine'); + return $this->objectManager->create('Affirm\Model\Rule\Condition\Combine'); } public function getActionsInstance() diff --git a/Model/Rule/Condition/Address.php b/Model/Rule/Condition/Address.php index a13a07c9..80642ba4 100755 --- a/Model/Rule/Condition/Address.php +++ b/Model/Rule/Condition/Address.php @@ -1,6 +1,6 @@ objectManager = $objectManager; $this->_eventManager = $eventManager; - $this->setType('Astound\Affirm\Model\Rule\Condition\Combine'); + $this->setType('Affirm\Model\Rule\Condition\Combine'); } public function getNewChildSelectOptions() { - $addressCondition = $this->objectManager->create('Astound\Affirm\Model\Rule\Condition\Address'); + $addressCondition = $this->objectManager->create('Affirm\Model\Rule\Condition\Address'); $addressAttributes = $addressCondition->loadAttributeOptions()->getAttributeOption(); $attributes = array(); foreach ($addressAttributes as $code=>$label) { - $attributes[] = array('value'=>'Astound\Affirm\Model\Rule\Condition\Address|'.$code, 'label'=>$label); + $attributes[] = array('value'=>'Affirm\Model\Rule\Condition\Address|'.$code, 'label'=>$label); } $conditions = parent::getNewChildSelectOptions(); $conditions = array_merge_recursive($conditions, array( array('value' => 'Magento\SalesRule\Model\Rule\Condition\Product\Found', 'label'=>__('Product attribute combination')), - array('value' => 'Astound\Affirm\Model\Rule\Condition\Product\Subselect', 'label'=>__('Products subselection')), + array('value' => 'Affirm\Model\Rule\Condition\Product\Subselect', 'label'=>__('Products subselection')), array('label' => __('Conditions combination'), 'value' => $this->getType()), array('label' => __('Cart Attribute'), 'value' => $attributes), )); diff --git a/Model/Rule/Condition/Product/Subselect.php b/Model/Rule/Condition/Product/Subselect.php index a0ce0404..751fb665 100755 --- a/Model/Rule/Condition/Product/Subselect.php +++ b/Model/Rule/Condition/Product/Subselect.php @@ -1,5 +1,5 @@ setType('Astound\Affirm\Model\Rule\Condition\Product\Subselect') + $this->setType('Affirm\Model\Rule\Condition\Product\Subselect') ->setValue(null); } diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php index 05432586..bf123b35 100644 --- a/Model/Ui/ConfigProvider.php +++ b/Model/Ui/ConfigProvider.php @@ -1,35 +1,32 @@ objectManager->create('Astound\Affirm\Model\ResourceModel\Rule')->getAttributes(); + $attributes = $this->objectManager->create('Affirm\Model\ResourceModel\Rule')->getAttributes(); foreach ($attributes as $code) { $attributesTransfer[] = $code; diff --git a/Plugin/RestrictPaymentMethods.php b/Plugin/RestrictPaymentMethods.php index 3573ed1e..aaa625f5 100755 --- a/Plugin/RestrictPaymentMethods.php +++ b/Plugin/RestrictPaymentMethods.php @@ -1,6 +1,6 @@ _allRules)) { $om = \Magento\Framework\App\ObjectManager::getInstance(); - $hlp = $om->create('Astound\Affirm\Model\Rule'); + $hlp = $om->create('Affirm\Model\Rule'); $this->_allRules = $hlp->getCollection()->addAddressFilter($address)->load(); foreach ($this->_allRules as $rule) { $rule->afterLoad(); diff --git a/Plugin/setCheckoutTokenGraphQL.php b/Plugin/setCheckoutTokenGraphQL.php index 505d7478..eb51000e 100644 --- a/Plugin/setCheckoutTokenGraphQL.php +++ b/Plugin/setCheckoutTokenGraphQL.php @@ -5,7 +5,7 @@ */ declare(strict_types=1); -namespace Astound\Affirm\Plugin; +namespace Affirm\Plugin; use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Quote\Model\Quote; diff --git a/Setup/InstallData.php b/Setup/InstallData.php index 6924b093..7f831c61 100644 --- a/Setup/InstallData.php +++ b/Setup/InstallData.php @@ -1,22 +1,19 @@ getConnection() - ->newTable($installer->getTable('astound_affirm_rule')) + ->newTable($installer->getTable('Affirm_rule')) ->addColumn( 'rule_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, @@ -88,7 +88,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con $table = $installer ->getConnection() - ->newTable($installer->getTable('astound_affirm_attribute')) + ->newTable($installer->getTable('Affirm_attribute')) ->addColumn( 'attr_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, @@ -110,13 +110,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con ->addIndex('rule_id', 'rule_id') ->addForeignKey( $installer->getFkName( - 'astound_affirm_attribute', + 'Affirm_attribute', 'rule_id', - 'astound_affirm_rule', + 'Affirm_rule', 'rule_id' ), 'rule_id', - $installer->getTable('astound_affirm_rule'), + $installer->getTable('Affirm_rule'), 'rule_id', \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE ); diff --git a/Setup/Uninstall.php b/Setup/Uninstall.php index a153effa..14749cc0 100644 --- a/Setup/Uninstall.php +++ b/Setup/Uninstall.php @@ -4,7 +4,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Astound\Affirm\Setup; +namespace Affirm\Setup; use Magento\Customer\Setup\CustomerSetupFactory; use Magento\Customer\Model\Customer; @@ -81,8 +81,8 @@ public function uninstall(SchemaSetupInterface $schemaSetup, ModuleContextInterf // Drop tables $schemaSetup->startSetup(); - $this->dropTable($schemaSetup, 'astound_affirm_rule'); - $this->dropTable($schemaSetup, 'astound_affirm_attribute'); + $this->dropTable($schemaSetup, 'Affirm_rule'); + $this->dropTable($schemaSetup, 'Affirm_attribute'); $schemaSetup->endSetup(); } diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index e2dfb292..555d6524 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -1,22 +1,19 @@ 'Multiple Financing Program type', 'input' => 'select', 'class' => '', - 'source' => 'Astound\Affirm\Model\Entity\Attribute\Source\FinancingProgramType', + 'source' => 'Affirm\Model\Entity\Attribute\Source\FinancingProgramType', 'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_WEBSITE, 'group' => 'General', 'visible' => 1, @@ -175,7 +172,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface 'input' => 'select', 'required' => 0, 'sort_order' => 101, - 'source' => 'Astound\Affirm\Model\Entity\Attribute\Source\FinancingProgramType', + 'source' => 'Affirm\Model\Entity\Attribute\Source\FinancingProgramType', 'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE, 'group' => 'General Information', 'is_used_in_grid' => 0, diff --git a/composer.json b/composer.json index c9780cdb..12a99774 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "registration.php" ], "psr-4": { - "Astound\\Affirm\\": "" + "Affirm\\": "" } } } diff --git a/etc/acl.xml b/etc/acl.xml index 6ce96eac..9a8233aa 100644 --- a/etc/acl.xml +++ b/etc/acl.xml @@ -12,14 +12,14 @@ - + - + diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml index 165a1427..60eba803 100644 --- a/etc/adminhtml/events.xml +++ b/etc/adminhtml/events.xml @@ -1,19 +1,19 @@ - + - + diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml index e8b3eae0..345c0d39 100755 --- a/etc/adminhtml/menu.xml +++ b/etc/adminhtml/menu.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml index 00d93fa6..3f44aa76 100644 --- a/etc/adminhtml/routes.xml +++ b/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 2b226ab4..b01bc187 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -38,7 +38,7 @@ - Astound\Affirm\Block\System\Config\Form\Field\Version + Affirm\Block\System\Config\Form\Field\Version @@ -46,7 +46,7 @@ - Astound\Affirm\Model\Adminhtml\Source\ModeAction + Affirm\Model\Adminhtml\Source\ModeAction @@ -72,7 +72,7 @@ - Astound\Affirm\Model\Adminhtml\Source\PaymentAction + Affirm\Model\Adminhtml\Source\PaymentAction @@ -127,7 +127,7 @@ - Astound\Affirm\Model\Adminhtml\Source\PaymentCheckoutFlow + Affirm\Model\Adminhtml\Source\PaymentCheckoutFlow @@ -146,7 +146,7 @@
general - Astound_Affirm::configuration + Affirm::configuration @@ -162,11 +162,11 @@ - Astound\Affirm\Model\Config\System\Source\Size + Affirm\Model\Config\System\Source\Size - Astound\Affirm\Model\Config\System\Source\Position + Affirm\Model\Config\System\Source\Position @@ -177,11 +177,11 @@ - Astound\Affirm\Model\Config\System\Source\Size + Affirm\Model\Config\System\Source\Size - Astound\Affirm\Model\Config\System\Source\Position + Affirm\Model\Config\System\Source\Position @@ -192,11 +192,11 @@ - Astound\Affirm\Model\Config\System\Source\Size + Affirm\Model\Config\System\Source\Size - Astound\Affirm\Model\Config\System\Source\Position::getBmlPositionsCPP + Affirm\Model\Config\System\Source\Position::getBmlPositionsCPP @@ -207,11 +207,11 @@ - Astound\Affirm\Model\Config\System\Source\Size + Affirm\Model\Config\System\Source\Size - Astound\Affirm\Model\Config\System\Source\Position::getCCPosition + Affirm\Model\Config\System\Source\Position::getCCPosition @@ -267,7 +267,7 @@ @@ -285,7 +285,7 @@ - Astound\Affirm\Model\Config\System\Source\Position::getBlockPlacementPDP + Affirm\Model\Config\System\Source\Position::getBlockPlacementPDP @@ -299,11 +299,11 @@ - Astound\Affirm\Block\System\Config\Form\Field\Date + Affirm\Block\System\Config\Form\Field\Date - Astound\Affirm\Block\System\Config\Form\Field\Date + Affirm\Block\System\Config\Form\Field\Date diff --git a/etc/config.xml b/etc/config.xml index 19002655..3af9f44e 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -1,12 +1,12 @@ diff --git a/etc/di.xml b/etc/di.xml index 68271125..6a949ca7 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -1,27 +1,27 @@ - - - - + + + + - \Astound\Affirm\Model\Ui\ConfigProvider::CODE + \Affirm\Model\Ui\ConfigProvider::CODE Magento\Payment\Block\Form - Astound\Affirm\Block\Info + Affirm\Block\Info AffirmOnePicaValueHandlerPool AffirmOnePicaCommandPool AffirmValidatorPool @@ -40,7 +40,7 @@ - \Astound\Affirm\Model\Ui\ConfigProvider::CODE + \Affirm\Model\Ui\ConfigProvider::CODE @@ -63,7 +63,7 @@ - + OnePicaAffirmGatewayConfig @@ -84,31 +84,31 @@ AffirmGatewayPreAuthorizeCommand - Astound\Affirm\Gateway\Command\AuthorizeStrategyCommand + Affirm\Gateway\Command\AuthorizeStrategyCommand AffirmGatewayAuthorizeCommand - Astound\Affirm\Gateway\Command\CaptureStrategyCommand + Affirm\Gateway\Command\CaptureStrategyCommand AffirmGatewayCaptureCommand AffirmGatewayRefundCommand AffirmGatewayVoidCommand - Astound\Affirm\Gateway\Command\CancelStrategyCommand + Affirm\Gateway\Command\CancelStrategyCommand - + AffirmOnePicaCommandPool - + AffirmOnePicaCommandPool - + AffirmOnePicaCommandPool @@ -120,9 +120,9 @@ AffirmGatewayAuthorizationRequest AffirmClientGatewayTransferFactory - Astound\Affirm\Gateway\Http\Client\ClientService - Astound\Affirm\Gateway\Response\TransactionAuthorizeHandler - Astound\Affirm\Gateway\Validator\Client\PaymentActionsValidator + Affirm\Gateway\Http\Client\ClientService + Affirm\Gateway\Response\TransactionAuthorizeHandler + Affirm\Gateway\Validator\Client\PaymentActionsValidator @@ -131,8 +131,8 @@ AffirmGatewayPreAuthorizationRequest AffirmPreAuthorizationGatewayTransferFactory - Astound\Affirm\Gateway\Http\Client\ClientService - Astound\Affirm\Gateway\Validator\Client\PaymentActionsValidatorPreAuthorize + Affirm\Gateway\Http\Client\ClientService + Affirm\Gateway\Validator\Client\PaymentActionsValidatorPreAuthorize @@ -142,9 +142,9 @@ AffirmGatewayCaptureRequest AffirmClientGatewayTransferFactory - Astound\Affirm\Gateway\Http\Client\ClientService - Astound\Affirm\Gateway\Validator\Client\PaymentActionsValidator - Astound\Affirm\Gateway\Response\TransactionCaptureHandler + Affirm\Gateway\Http\Client\ClientService + Affirm\Gateway\Validator\Client\PaymentActionsValidator + Affirm\Gateway\Response\TransactionCaptureHandler @@ -154,9 +154,9 @@ AffirmGatewayRefundRequest AffirmClientGatewayTransferFactory - Astound\Affirm\Gateway\Http\Client\ClientService - Astound\Affirm\Gateway\Validator\Client\PaymentActionsValidator - Astound\Affirm\Gateway\Response\TransactionRefundHandler + Affirm\Gateway\Http\Client\ClientService + Affirm\Gateway\Validator\Client\PaymentActionsValidator + Affirm\Gateway\Response\TransactionRefundHandler @@ -166,17 +166,17 @@ AffirmGatewayVoidRequest AffirmClientGatewayTransferFactory - Astound\Affirm\Gateway\Http\Client\ClientService - Astound\Affirm\Gateway\Validator\Client\PaymentActionsValidatorVoid - + Affirm\Gateway\Http\Client\ClientService + Affirm\Gateway\Validator\Client\PaymentActionsValidatorVoid + - + AffirmLogger - Astound\Affirm\Gateway\Http\Converter\JsonToArray + Affirm\Gateway\Http\Converter\JsonToArray @@ -190,13 +190,13 @@ - Astound\Affirm\Gateway\Request\AuthorizationRequest + Affirm\Gateway\Request\AuthorizationRequest - + OnePicaAffirmGatewayConfig @@ -206,7 +206,7 @@ - Astound\Affirm\Gateway\Request\PreAuthorizationRequest + Affirm\Gateway\Request\PreAuthorizationRequest @@ -215,7 +215,7 @@ - Astound\Affirm\Gateway\Request\CaptureRequest + Affirm\Gateway\Request\CaptureRequest @@ -223,7 +223,7 @@ - Astound\Affirm\Gateway\Request\RefundRequest + Affirm\Gateway\Request\RefundRequest @@ -231,90 +231,90 @@ - Astound\Affirm\Gateway\Request\VoidRequest + Affirm\Gateway\Request\VoidRequest - + AffirmClientTransactionAction OnePicaAffirmGatewayConfig - + - Astound\Affirm\Gateway\Helper\Request\Action::API_TRANSACTIONS_PATH + Affirm\Gateway\Helper\Request\Action::API_TRANSACTIONS_PATH - + OnePicaAffirmGatewayConfig - + AffirmPreAuthorizationTransactionAction OnePicaAffirmGatewayConfig - + - Astound\Affirm\Gateway\Helper\Request\Action::API_CHECKOUT_PATH + Affirm\Gateway\Helper\Request\Action::API_CHECKOUT_PATH - + - + - + - + - + - + OnePicaAffirmGatewayFacade - + - + - + Magento\Framework\Filesystem\Driver\File - + AffirmDebugLogger - Astound\Affirm\Logger\Handler + Affirm\Logger\Handler diff --git a/etc/events.xml b/etc/events.xml index 808bddb8..b575ed56 100644 --- a/etc/events.xml +++ b/etc/events.xml @@ -1,19 +1,19 @@ - + - + diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml index 5790f926..d8b5189a 100644 --- a/etc/frontend/di.xml +++ b/etc/frontend/di.xml @@ -1,45 +1,45 @@ - Astound\Affirm\Model\Ui\ConfigProvider + Affirm\Model\Ui\ConfigProvider - + 1 - + OnePicaAffirmGatewayConfig - + - + - + - + diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml index 159d8113..4def0c61 100644 --- a/etc/frontend/events.xml +++ b/etc/frontend/events.xml @@ -1,25 +1,25 @@ - + - + - + - + diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml index 57c4c6a0..e951c41b 100644 --- a/etc/frontend/routes.xml +++ b/etc/frontend/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/etc/graphql/di.xml b/etc/graphql/di.xml index f6b46a2c..91cc75ce 100644 --- a/etc/graphql/di.xml +++ b/etc/graphql/di.xml @@ -2,6 +2,6 @@ - + diff --git a/etc/module.xml b/etc/module.xml index 5262389d..1993a77c 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,16 +1,16 @@ - + diff --git a/etc/webapi.xml b/etc/webapi.xml index e67399c0..15b4565b 100644 --- a/etc/webapi.xml +++ b/etc/webapi.xml @@ -8,25 +8,25 @@ - + - + - + - + diff --git a/registration.php b/registration.php index ded10e19..8d41dbfe 100644 --- a/registration.php +++ b/registration.php @@ -1,23 +1,20 @@ - + diff --git a/view/adminhtml/layout/affirm_rule_edit.xml b/view/adminhtml/layout/affirm_rule_edit.xml index 145544db..6737c451 100755 --- a/view/adminhtml/layout/affirm_rule_edit.xml +++ b/view/adminhtml/layout/affirm_rule_edit.xml @@ -1,30 +1,30 @@ - + - + - astound_affirm_rule_edit_tabs + Affirm_rule_edit_tabs edit_form Payment Restrictions Options - - + + general - astound_affirm_rule_edit_tab_general + Affirm_rule_edit_tab_general conditions - astound_affirm_rule_edit_tab_conditions + Affirm_rule_edit_tab_conditions - + \ No newline at end of file diff --git a/view/adminhtml/layout/affirm_rule_index.xml b/view/adminhtml/layout/affirm_rule_index.xml index cdc8e8f2..8b9ff8fd 100755 --- a/view/adminhtml/layout/affirm_rule_index.xml +++ b/view/adminhtml/layout/affirm_rule_index.xml @@ -1,11 +1,11 @@ - + - astound_affirm_rule_grid - Astound\Affirm\Model\ResourceModel\Rule\Collection + Affirm_rule_grid + Affirm\Model\ResourceModel\Rule\Collection pos ASC 1 @@ -68,7 +68,7 @@ Methods methods - Astound\Affirm\Block\Adminhtml\Rule\Grid\Renderer\Methods + Affirm\Block\Adminhtml\Rule\Grid\Renderer\Methods @@ -76,7 +76,7 @@ Customer Groups cust_groups - Astound\Affirm\Block\Adminhtml\Rule\Grid\Renderer\Groups + Affirm\Block\Adminhtml\Rule\Grid\Renderer\Groups @@ -84,7 +84,7 @@ Store Views stores - Astound\Affirm\Block\Adminhtml\Rule\Grid\Renderer\Stores + Affirm\Block\Adminhtml\Rule\Grid\Renderer\Stores @@ -93,7 +93,7 @@ Status is_active options - Astound\Affirm\Block\Adminhtml\Rule\Grid\Renderer\Color + Affirm\Block\Adminhtml\Rule\Grid\Renderer\Color 0 diff --git a/view/adminhtml/templates/affirm/error.phtml b/view/adminhtml/templates/affirm/error.phtml index 4f8a9bd9..135ff9bf 100644 --- a/view/adminhtml/templates/affirm/error.phtml +++ b/view/adminhtml/templates/affirm/error.phtml @@ -1,8 +1,8 @@

diff --git a/view/adminhtml/ui_component/category_form.xml b/view/adminhtml/ui_component/category_form.xml index 331e7ee4..5ff159b2 100644 --- a/view/adminhtml/ui_component/category_form.xml +++ b/view/adminhtml/ui_component/category_form.xml @@ -21,7 +21,7 @@ - Astound\Affirm\Model\Entity\Attribute\Source\FinancingProgramType + Affirm\Model\Entity\Attribute\Source\FinancingProgramType 2 string diff --git a/view/frontend/layout/catalog_category_view.xml b/view/frontend/layout/catalog_category_view.xml index 0c2c648b..c6e926de 100644 --- a/view/frontend/layout/catalog_category_view.xml +++ b/view/frontend/layout/catalog_category_view.xml @@ -1,26 +1,23 @@ - + category 0 @@ -28,7 +25,7 @@ - + category 1 @@ -36,7 +33,7 @@ - + category 3 @@ -44,7 +41,7 @@ - + category 2 diff --git a/view/frontend/layout/catalog_category_view_type_layered.xml b/view/frontend/layout/catalog_category_view_type_layered.xml index 0cabeee6..311648ff 100644 --- a/view/frontend/layout/catalog_category_view_type_layered.xml +++ b/view/frontend/layout/catalog_category_view_type_layered.xml @@ -8,7 +8,7 @@ - + category 2 diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml index 89fbd7d2..cd59edea 100644 --- a/view/frontend/layout/catalog_product_view.xml +++ b/view/frontend/layout/catalog_product_view.xml @@ -1,32 +1,29 @@ - + product 0 - + product 1 @@ -34,7 +31,7 @@ - + product 2 @@ -42,7 +39,7 @@ - + product 2 @@ -50,19 +47,19 @@ - + pdp 0 - + pdp 1 - + pdp 2 diff --git a/view/frontend/layout/catalog_product_view_type_bundle.xml b/view/frontend/layout/catalog_product_view_type_bundle.xml index a70d797c..612fee87 100644 --- a/view/frontend/layout/catalog_product_view_type_bundle.xml +++ b/view/frontend/layout/catalog_product_view_type_bundle.xml @@ -1,26 +1,23 @@ - + pdp bundle diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml index 945e42ae..b473aa21 100644 --- a/view/frontend/layout/checkout_cart_index.xml +++ b/view/frontend/layout/checkout_cart_index.xml @@ -1,38 +1,35 @@ - - + + cc - + checkout_cart 2 - + checkout_cart 3 @@ -40,13 +37,13 @@ - + checkout_cart 0 - + checkout_cart 1 diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 7740e827..3a4be049 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -1,25 +1,22 @@ - + @@ -39,7 +36,7 @@ - Astound_Affirm/js/view/payment/affirm_gateway + Affirm/js/view/payment/affirm_gateway true diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml index 1082eb9f..370b27eb 100644 --- a/view/frontend/layout/checkout_onepage_success.xml +++ b/view/frontend/layout/checkout_onepage_success.xml @@ -35,15 +35,15 @@ - - diff --git a/view/frontend/layout/cms_index_index.xml b/view/frontend/layout/cms_index_index.xml index abf0afa6..61de426a 100644 --- a/view/frontend/layout/cms_index_index.xml +++ b/view/frontend/layout/cms_index_index.xml @@ -1,32 +1,29 @@ - + homepage 0 - + homepage 1 @@ -34,13 +31,13 @@ - + homepage 2 - + homepage 3 diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml index 2222c557..69f5ba50 100644 --- a/view/frontend/layout/default.xml +++ b/view/frontend/layout/default.xml @@ -1,25 +1,22 @@ - + @@ -35,9 +32,9 @@ - Astound_Affirm/js/view/minicart + Affirm/js/view/minicart - Astound_Affirm/minicart/info + Affirm/minicart/info diff --git a/view/frontend/page_layout/1column.xml b/view/frontend/page_layout/1column.xml index c9f60269..757fbc25 100644 --- a/view/frontend/page_layout/1column.xml +++ b/view/frontend/page_layout/1column.xml @@ -1,19 +1,16 @@ diff --git a/view/frontend/page_layout/2columns-left.xml b/view/frontend/page_layout/2columns-left.xml index c9f60269..757fbc25 100644 --- a/view/frontend/page_layout/2columns-left.xml +++ b/view/frontend/page_layout/2columns-left.xml @@ -1,19 +1,16 @@ diff --git a/view/frontend/page_layout/2columns-right.xml b/view/frontend/page_layout/2columns-right.xml index c9f60269..757fbc25 100644 --- a/view/frontend/page_layout/2columns-right.xml +++ b/view/frontend/page_layout/2columns-right.xml @@ -1,19 +1,16 @@ diff --git a/view/frontend/page_layout/3columns.xml b/view/frontend/page_layout/3columns.xml index c9f60269..757fbc25 100644 --- a/view/frontend/page_layout/3columns.xml +++ b/view/frontend/page_layout/3columns.xml @@ -1,19 +1,16 @@ diff --git a/view/frontend/page_layout/empty.xml b/view/frontend/page_layout/empty.xml index c9f60269..757fbc25 100644 --- a/view/frontend/page_layout/empty.xml +++ b/view/frontend/page_layout/empty.xml @@ -1,19 +1,16 @@ diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js index b19d7700..98807785 100644 --- a/view/frontend/requirejs-config.js +++ b/view/frontend/requirejs-config.js @@ -1,30 +1,27 @@ /** - * Astound + * Affirm * NOTICE OF LICENSE * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to codemaster@astoundcommerce.com so we can send you a copy immediately. * * @category Affirm - * @package Astound_Affirm - * @copyright Copyright (c) 2016 Astound, Inc. (http://www.astoundcommerce.com) + * @package Affirm + * @copyright Copyright (c) 2021 Affirm. All rights reserved. * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ var config = { map: { '*': { - 'synchPost': 'Astound_Affirm/js/action/send-request', - 'affirmPixel': 'Astound_Affirm/js/affirmPixel', - 'affirmWidget': 'Astound_Affirm/js/affirmWidget', - 'aslowasPDP': 'Astound_Affirm/js/aslowasPDP', - 'aslowasPLP': 'Astound_Affirm/js/aslowasPLP', - 'aslowasCC': 'Astound_Affirm/js/aslowasCC', - 'aslowasMC': 'Astound_Affirm/js/aslowasMC' + 'synchPost': 'Affirm/js/action/send-request', + 'affirmPixel': 'Affirm/js/affirmPixel', + 'affirmWidget': 'Affirm/js/affirmWidget', + 'aslowasPDP': 'Affirm/js/aslowasPDP', + 'aslowasPLP': 'Affirm/js/aslowasPLP', + 'aslowasCC': 'Affirm/js/aslowasCC', + 'aslowasMC': 'Affirm/js/aslowasMC' } } }; diff --git a/view/frontend/templates/onepage/button.phtml b/view/frontend/templates/onepage/button.phtml index c7538e24..2b628051 100644 --- a/view/frontend/templates/onepage/button.phtml +++ b/view/frontend/templates/onepage/button.phtml @@ -1,7 +1,7 @@ isAvailable()): ?> getCheckoutUrl(); ?>"}}' /> diff --git a/view/frontend/templates/promotion/aslowasPDP.phtml b/view/frontend/templates/promotion/aslowasPDP.phtml index 990c2529..b8d50171 100644 --- a/view/frontend/templates/promotion/aslowasPDP.phtml +++ b/view/frontend/templates/promotion/aslowasPDP.phtml @@ -40,7 +40,7 @@ $learnMore = $block->getLearnMoreValue(); ?> - + getDataAffirmColor() . ' data-learnmore-show="'.$learnMore.'">'; ?> diff --git a/view/frontend/templates/promotion/bml.phtml b/view/frontend/templates/promotion/bml.phtml index 96f86353..5a0f6cdf 100644 --- a/view/frontend/templates/promotion/bml.phtml +++ b/view/frontend/templates/promotion/bml.phtml @@ -44,7 +44,7 @@ getStartContainerTag(); ?> - + '; diff --git a/view/frontend/web/js/action/send-to-affirm-checkout.js b/view/frontend/web/js/action/send-to-affirm-checkout.js index df1fbcd5..81706604 100644 --- a/view/frontend/web/js/action/send-to-affirm-checkout.js +++ b/view/frontend/web/js/action/send-to-affirm-checkout.js @@ -6,12 +6,12 @@ define([ "jquery", "mage/translate", - "Astound_Affirm/js/model/aslowas", + "Affirm/js/model/aslowas", "Magento_Checkout/js/model/full-screen-loader", "Magento_Checkout/js/model/quote", "mage/url", 'Magento_Customer/js/model/customer', - "Astound_Affirm/js/model/affirm", + "Affirm/js/model/affirm", 'Magento_Ui/js/model/messageList' ], function ($, $t, loadScript, fullScreenLoader, quote, url, customer, affirmCheckout, Messages) { diff --git a/view/frontend/web/js/affirmPixel.js b/view/frontend/web/js/affirmPixel.js index 65137f36..d4b7d631 100644 --- a/view/frontend/web/js/affirmPixel.js +++ b/view/frontend/web/js/affirmPixel.js @@ -35,7 +35,7 @@ /*jshint jquery:true*/ define([ "jquery", - "Astound_Affirm/js/model/aslowas" + "Affirm/js/model/aslowas" ], function ($, aslowas) { "use strict" diff --git a/view/frontend/web/js/affirmWidget.js b/view/frontend/web/js/affirmWidget.js index 51699ccd..33373f70 100644 --- a/view/frontend/web/js/affirmWidget.js +++ b/view/frontend/web/js/affirmWidget.js @@ -1,12 +1,12 @@ /** - * Copyright © 2016 Astound. All rights reserved. + * Copyright © 2021 Affirm. All rights reserved. * See COPYING.txt for license details. */ /*jshint jquery:true*/ define([ "jquery", - "Astound_Affirm/js/model/aslowas" + "Affirm/js/model/aslowas" ], function ($, aslowas) { "use strict" diff --git a/view/frontend/web/js/aslowasCC.js b/view/frontend/web/js/aslowasCC.js index 6d1576f5..733725e1 100644 --- a/view/frontend/web/js/aslowasCC.js +++ b/view/frontend/web/js/aslowasCC.js @@ -1,11 +1,11 @@ /** - * Copyright © 2016 Astound. All rights reserved. + * Copyright © 2021 Affirm. All rights reserved. * See COPYING.txt for license details. */ /*jshint jquery:true*/ define(["jquery", "mage/translate", - "Astound_Affirm/js/model/aslowas", + "Affirm/js/model/aslowas", "Magento_Checkout/js/model/quote" ], function ($, $t, aslowas, quote) { "use strict" diff --git a/view/frontend/web/js/aslowasMC.js b/view/frontend/web/js/aslowasMC.js index 860e16c1..7298a25f 100644 --- a/view/frontend/web/js/aslowasMC.js +++ b/view/frontend/web/js/aslowasMC.js @@ -1,11 +1,11 @@ /** - * Copyright © 2016 Astound. All rights reserved. + * Copyright © 2021 Affirm. All rights reserved. * See COPYING.txt for license details. */ /*jshint jquery:true*/ define(["jquery", "mage/translate", - "Astound_Affirm/js/model/aslowas", + "Affirm/js/model/aslowas", "Magento_Customer/js/customer-data" ], function ($, $t, aslowas, customerData) { "use strict" diff --git a/view/frontend/web/js/aslowasPDP.js b/view/frontend/web/js/aslowasPDP.js index 979089d7..56a904c8 100644 --- a/view/frontend/web/js/aslowasPDP.js +++ b/view/frontend/web/js/aslowasPDP.js @@ -1,11 +1,11 @@ /** - * Copyright © 2016 Astound. All rights reserved. + * Copyright © 2021 Affirm. All rights reserved. * See COPYING.txt for license details. */ /*jshint jquery:true*/ define(["jquery", "mage/translate", - "Astound_Affirm/js/model/aslowas" + "Affirm/js/model/aslowas" ], function ($, $t, aslowas) { "use strict" diff --git a/view/frontend/web/js/aslowasPLP.js b/view/frontend/web/js/aslowasPLP.js index db176b04..5288a527 100755 --- a/view/frontend/web/js/aslowasPLP.js +++ b/view/frontend/web/js/aslowasPLP.js @@ -1,11 +1,11 @@ /** - * Copyright © 2016 Astound. All rights reserved. + * Copyright © 2021 Affirm. All rights reserved. * See COPYING.txt for license details. */ /*jshint jquery:true*/ define(["jquery", "mage/translate", - "Astound_Affirm/js/model/aslowas" + "Affirm/js/model/aslowas" ], function ($, $t, aslowas) { "use strict" diff --git a/view/frontend/web/js/model/affirm.js b/view/frontend/web/js/model/affirm.js index 099f3510..3146faf9 100644 --- a/view/frontend/web/js/model/affirm.js +++ b/view/frontend/web/js/model/affirm.js @@ -27,7 +27,7 @@ define([ /** * Get checkout data * - * @returns {{merchant: (*|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Astound_Affirm.js.model.affirm.merchant|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Astound_Affirm.js.model.affirm.getData.merchant|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Astound_Affirm.js.model.affirm.merchant|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Astound_Affirm.js.model.affirm.getData.merchant|checkout.merchant), config: (*|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Magento_Shipping.js.view.checkout.shipping.shipping-policy.config|affirm2_ee_new.vendor.magento.module-shipping.view.frontend.web.js.view.checkout.shipping.shipping-policy.config|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Magento_Shipping.js.view.checkout.shipping.shipping-policy.config|exports.file.options.config|exports.test.options.config), items: *, order_id: *, shipping_amount: (null|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Astound_Affirm.js.model.affirm.shippingAmount|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Astound_Affirm.js.model.affirm.shippingAmount|number)}} + * @returns {{merchant: (*|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Affirm.js.model.affirm.merchant|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Affirm.js.model.affirm.getData.merchant|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Affirm.js.model.affirm.merchant|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Affirm.js.model.affirm.getData.merchant|checkout.merchant), config: (*|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Magento_Shipping.js.view.checkout.shipping.shipping-policy.config|affirm2_ee_new.vendor.magento.module-shipping.view.frontend.web.js.view.checkout.shipping.shipping-policy.config|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Magento_Shipping.js.view.checkout.shipping.shipping-policy.config|exports.file.options.config|exports.test.options.config), items: *, order_id: *, shipping_amount: (null|affirm2_ee_new.pub.static.frontend.Magento.luma.en_US.Affirm.js.model.affirm.shippingAmount|affirm2_ee_new.pub.static.frontend.Magento.blank.en_US.Affirm.js.model.affirm.shippingAmount|number)}} */ getData: function() { var _self = this; diff --git a/view/frontend/web/js/view/payment/affirm_gateway.js b/view/frontend/web/js/view/payment/affirm_gateway.js index 44416a06..c80e1f30 100644 --- a/view/frontend/web/js/view/payment/affirm_gateway.js +++ b/view/frontend/web/js/view/payment/affirm_gateway.js @@ -1,17 +1,14 @@ /** - * Astound + * Affirm * NOTICE OF LICENSE * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to codemaster@astoundcommerce.com so we can send you a copy immediately. * * @category Affirm - * @package Astound_Affirm - * @copyright Copyright (c) 2016 Astound, Inc. (http://www.astoundcommerce.com) + * @package Affirm + * @copyright Copyright (c) 2021 Affirm. All rights reserved. * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /*browser:true*/ @@ -29,7 +26,7 @@ define( rendererList.push( { type: 'affirm_gateway', - component: 'Astound_Affirm/js/view/payment/method-renderer/affirm_gateway' + component: 'Affirm/js/view/payment/method-renderer/affirm_gateway' } ); /** Add view logic here if needed */ diff --git a/view/frontend/web/js/view/payment/method-renderer/affirm_gateway.js b/view/frontend/web/js/view/payment/method-renderer/affirm_gateway.js index 9c0fc029..c41c59c0 100644 --- a/view/frontend/web/js/view/payment/method-renderer/affirm_gateway.js +++ b/view/frontend/web/js/view/payment/method-renderer/affirm_gateway.js @@ -1,17 +1,14 @@ /** - * Astound + * Affirm * NOTICE OF LICENSE * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to codemaster@astoundcommerce.com so we can send you a copy immediately. * * @category Affirm - * @package Astound_Affirm - * @copyright Copyright (c) 2016 Astound, Inc. (http://www.astoundcommerce.com) + * @package Affirm + * @copyright Copyright (c) 2021 Affirm. All rights reserved. * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /*browser:true*/ @@ -26,10 +23,10 @@ define( 'Magento_Checkout/js/model/error-processor', 'Magento_Ui/js/model/messages', 'Magento_Checkout/js/action/set-payment-information', - 'Astound_Affirm/js/action/prepare-affirm-checkout', - 'Astound_Affirm/js/action/send-to-affirm-checkout', - 'Astound_Affirm/js/action/verify-affirm', - 'Astound_Affirm/js/action/inline-checkout' + 'Affirm/js/action/prepare-affirm-checkout', + 'Affirm/js/action/send-to-affirm-checkout', + 'Affirm/js/action/verify-affirm', + 'Affirm/js/action/inline-checkout' ], function ($, Component, quote, additionalValidators, urlBuilder, errorProcessor, Messages, setPaymentAction, @@ -39,7 +36,7 @@ define( return Component.extend({ defaults: { - template: 'Astound_Affirm/payment/form', + template: 'Affirm/payment/form', transactionResult: '' }, diff --git a/view/frontend/web/template/payment/form.html b/view/frontend/web/template/payment/form.html index 1043e760..06edd44c 100644 --- a/view/frontend/web/template/payment/form.html +++ b/view/frontend/web/template/payment/form.html @@ -1,18 +1,15 @@