Version Notes
## Version 1.1.3
- ENHANCEMENT: add notifications to get news about the extension when updates are available. This can be via the configuration disabled.
- ENHANCEMENT: add configuration options for watermark picture to publish products with a specific watermark for the ricardo.ch platform
- ENHANCEMENT: add configuration options to allow or not to use the product image placeholder of a shop owner in case of issue with missing picture files on server or in case of memory limit error
- FIX: missing transactions import when products were already sold
- FIX: prevent to stop an article if it has been sold but has been automatically reactivated on ricardo.ch side
- FIX: status of products was not correctly set when a product is sold and internally saved
- FIX: display of category mapping popup on IE < 9
- FIX: confirmation fees popup on IE all versions
- FIX: issue when trying to warm up product pictures while saving product listing items with products having no picture basic selection
- FIX: price calculation when orders are imported into a non Swiss shop
## Version 1.1.2
- ENHANCEMENT: allow html code for payment information
- ENHANCEMENT: prevent unwanted email sending
- ENHANCEMENT: add system.log in the configuration export for assistance purpose
- FIX: issue with quantity to use when publishing on ricardo.ch if the product inventory is not managed
- FIX: prevent to use default Magento picture if an article do not set base picture for a product
- FIX: add missing french token expiration email template
- FIX: issue with some store configuration having several store views but no default store (made some issue to get current currency value)
## Version 1.1.1
- ENHANCEMENT: warm up the cache of picture after a product is inserted in the product list
- FIX: issue with logic to get sold and unsold articles necessary when articles were planned then publicly available and in the meantime has been sold without that the extension knows about the new article ID
## Version 1.1.0
- NEW: add buttons to export configuration into a tar.gz archive and/or send it to support shop owner in case of issue with all necessary information: php, magento, installed modules version, ricardo and latest order tables from the database, log files. No customer information are saved.
- NEW: support currency conversion based on the defined Magento currencies rate. It sets prices in CHF to ricardo.ch, products with price catalog in EUR/USD/... and does the opposite while importing a ricardo order in Magento (CHF to EUR/USD/...). Magento Currency Rates must be configured to work.
- NEW: while selecting a ricardo category, you can now provide the product name to get a suggestion of the category/ies you may use
- NEW: display a popup window with a summary of the fees for the current product list before to proceed "Check and List". Data of the form are saved when relevant before to display these fees
- NEW: allow to merge short and description if ricardo description is missing at product level and if the extension is configured for that - Default "disabled"
- NEW: support Magento Watermark Pictures
- NEW: add ricardo banner in the dashboard of the extension
- ENHANCEMENT: make description with carriage return to
HTML Tag configurable - default is 0
- ENHANCEMENT: refactor order import process to reduce potential issues
- ENHANCEMENT: add a new dispatcher to close articles properly for those which are not anymore available on ricardo.ch
- ENHANCEMENT: global performance improvement with the ricardo API and product pictures (> X MB - image attribute and media gallery)
- ENHANCEMENT: configurable products and their options having price are computed differently, it fixes some issues with price calculation but also allow Fees calculation
- ENHANCEMENT: links of the backend user interface depending on the user language are correctly defined (french or german)
- ENHANCEMENT: related products of configurable products are displayed in the products grid of a list after a product is added or after the products listing is saved instead to wait that the product listing is checked
- ENHANCEMENT: cleanup, factorize and perform code related to configurable products
- ENHANCEMENT: set auto increment value of auction sales type to 1 per default
- ENHANCEMENT: the inventory column in the products grid of the products listing has several meaning: 1) if the product is already listed, the value displayed is the quantity of product sent and still available on ricardo, 2) if the product is not yet listed, the quantity displayed is calculated based on the configuration at the product list or the product level, it will be automatically refreshed if the stock of the product changed before it is listed.
- FIX: issue with price calculation when price scope is per website instead global
- FIX: issue with grouped product quantity - default is 1 if related products don't have quantity defined
- FIX: issue with order synchronization on Magento 1.7 and the ricardo payment method
- FIX: issue with Internet Explorer when configuring a product and using defaults values are not expected
- FIX: some translations issue
- FIX: issue with shipping description while editing the configuration at product level into a products listing
- FIX: memory issue due to pictures too big and API requirements (bytes array)
- FIX: issue with MagentoConnect install
## Version 1.0.18
- Add improvements brought by the ricardo library
## Version 1.0.17
- Fix an issue with the transfer of the data via API
## Version 1.0.16
- 077aced Fix issue with wrong memory test at picture level
- 4fb9f9f Change comment
- 0acd985 Improve memory consumption due to images and expected bytes array on ricardo API side
- 411b1b8 Change url for the ricardo assistant on production
- 05d9364 Update README for license information
- 947efb5 Factorize some process in order creation
- 970f5ee Update translation string
- ccc9802 Update translation string "Until sold"
- 73aadc0 [ENHANCE] Seems that external extension instantiate the shipping class, as it is outside of the order scope, an object is missing and provide an error. We fixed it even if we don't support externa
- b161609 [ENHANCE] Prevent memory consumption due to the size of pictures and the fact that we need to unpack the pictures bytes to create bytes array for the ricardo.ch API
- 41e95ee Update Copyright to ricardo.ch AG (keep same license)
- 128b28d Update config.xml version
- 29b5e61 Update language string key in CSV files
## Version 1.0.15
- 8cc97f0 [ENHANCE] Delete old jobs in the SQL way (no collection), speed up the delete and may prevent mysql error
- 571d315 Open new window for a link located into the product list and jumping into ricardo.ch website
- d6be0f1 [BUGFIX] Change the translation string from Ricardo to ricardo.ch
- 195c744 Cosmetic code improvements
- ddd1ff0 Fix an issue with deleting product item from a listing
- 7a71702 Revert deleted xml file to generate magento connect package
- 7fc6abb Update order dispatcher to get error messages
- 6804aba Update Hint.php
## Version 1.0.14
- Fix an issue revealed after fixes done in version 1.0.13 related to getting sales options and rules from products listing item during getting new orders
## Version 1.0.13
- Important fix for price products (and sales options & rules in general) when several listing processes running at same time
## Version 1.0.12
- 7485ad0 Prevent Exception while editing product if API problem appear while conditions options
- 2927622 Add translation for frontend, change payment info template
- 29069ea Fix wrong variable name for payment method instruction
- 1738457 add payment block info in frontend area too for email generated from backend
- 259f885 Fix issue with products grid and massaction
- 8d37514 Update readme file
- ea18812 Redirect to edit page if error occur
- 0fe5a3c Implement Bank information display if ricardo.ch payment method Bank transfer is used, Remove the cleanup listing log as it is duplicate with the job cleanup
- 9cd82a8 Change order of the tab display 1) Synchronization 2) Listing Log instead of the opposite
- bc809c0 Fix random security error message on fresh install
## Version 1.0.10
- e2304ab Change the status of an item to stop if the item has not been sold. It will stop the complete list if all items are stopped.
- e2c0676 Set website Id while saving new customer even if store id was also provided to be sure that the user is saved into the correct website
- 0d01b4a Fix missing log url in message
- ff1005c Skip required option when creating an order, also for custom option
- 9b48ef6 Fix missing home number
## Version 1.0.9
- Fix issue with some optional API property set to 0 (like template Id)
- 0c1eb42 Revert temporary success / error in dispatcher list , improve translations of string in product grid
- 74c3284 Show a small message in sync grid while running or chunk running to allow to differentiate both kind of sync
- 68eed7f Raise to 400 items to trigger in dispatch
- 1d3a839 Prevent create a new job while having a chunk running sync list
- 3241ef0 Change the way to handle the bucket of items in the dispatcher, fix a bug while triggering the order dispatcher and getting the list of listed items
- adcbc59 Improve message display in sync grid
- 6b6c45e Fix issue with "Until Sold" feature
- 2f48ea4 Improve the way to set/get successful or error log item
- 86fcc17 Display Product list name in the sync log grid instead to put it as message
- 1219b09 Fix issue with products grid and configurable products having article inserted also as simple article
- 95efdca Fix duplicate collection item error
- 4d38ed3 Make the option Schedule Reactivation "Until Sold" better explicit and working
- 03bc9cd Update code documentation
- 658c9f6 In some cases, picture's extension is not recognized so change the logic to determine if it exists or not Catch Exception and log them in cron class
## Version 1.0.8
- b5f1afa Update translations file
- c0d3fbb Fix issue with dispatcher and completed status
- 27c48c9 Fix interface issue (invisible language was also required input) with language selection and payment method "other" which needs a payment description and shipping description field if shipping "other" is selected
- 9e0be11 Improve debugging content when dispatcher mets errors
- b994fa0 Improve grid translations for products
- 84baa1b Change order of token DEV/PROD configuration fields
- 868e576 Fix issue with product price max limit (should be only for "Buy now" and payment method with credit card)
- 379a51b Fix issue with too long strings saved into DB if error occurred
- 0eb9f8d Cosmetic code changes
- 79ce926 Change translation
- 356c909 Fix issue with job message and json encoding (some loop appeared in some use cases)
- 738f316 Better judge if some values must be retrieved from the API depending if the extension is configured or not
- cd34d94 Prevent loop when doing the dispatch
- 14d3beb fix uninstall file txt with wrong language folder package
- a5e6350 Fix translation issue in the sync grid
- 90a2f7c Fix issue if extension is disabled with payment and shipping methods
- 33055cc Add nl2br for description
## Version 1.0.7
- 42f18da Prevent warning messages for some variables, Prevent Exception when picture doesn't exist in preview, set per default the dev mode to 1 because user receives BETA API Token first and some people doesn't set correctly the configuration
- 29767d9 Add more condition to display error in case of wrong API configuration and coming from banner notification
- 57da567 Invite user to check his configuration if a problem occurs
- c514cb0 Merge branch 'develop'
## Version 1.0.6
- 6a6ca4f Do not set the status of the parent configurable product when list on ricardo.ch
- eb0d25a Handle correctly errors if done in the backend notification banner
- 68f812a add short description as fallback product description
- bb0c931 change redirect url and add error message
- c4fbe49 Check and List action: save also product listing information
- 349218a Merge branch 'develop' of git://github.com/diglin/ricento into develop
- f467eb4 Fix issue with grid of products after filter reset (missing form key hidden field)
- 4cc8e3b Revert changes done for RIC-102, display products item w/o any error
- afb9215 Add new url to register to the API
- c0b50e9 In case errors are coming from the API but it is at backend notification level, we catch the error and display it as session error message
- 7d0c803 Merge branch 'develop' of github.com:diglin/ricento into develop
- 068a409 allow to delete a job even if it is running, fix some typo translations, allow to save when clicking on "check and list" button from a product listing
## Version 1.0.5
- c1b3c90 Merge branch 'develop'
- 9f59a2f Fix definitely issue RIC-102 with product grid display
- 3c3547a Fix issue RIC-102: product grid display in product listing with some configuration provide error cause of the collection and duplicate items found
- 5d1706e Merge pull request #1 from diglin/develop
## Version 1.0.4
- ebaec62 Remove the filter collection to not get "not visible" products. Don't remember the reason of this filter, hope it doesn't have consequence with order creation (normally no)
- 90e2a93 Merge branch 'develop'
## Version 1.0.3
- c55a6dd Fix issue with wrong store id, should not be website id while getting storeConfig
- 00c2960 Update README.md
## Version 1.0.2
- 880dbfd Fix issue if API not yet configured and Product Edit Page is requested from the backend
- 5841d06 Update gitsubmodule (replace bitbucket with github)
- be2b77a Update readme file
- 9384e3c Update doc
Download this release
Release Info
| Developer | diglin |
| Extension | diglin_ricento |
| Version | 1.1.3 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.2 to 1.1.3
- app/code/community/Diglin/Ricento/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Block/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Block/Adminhtml/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Block/Adminhtml/Form/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Block/Adminhtml/Form/Element/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Edit/Tabs/General.php +3 -2
- app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Grid/Renderer/Status.php +2 -2
- app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Item/Preview.php +16 -9
- app/code/community/Diglin/Ricento/Controller/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Controller/Adminhtml/Products/Listing.php +1 -1
- app/code/community/Diglin/Ricento/Helper/Data.php +17 -0
- app/code/community/Diglin/Ricento/Helper/Image.php +69 -3
- app/code/community/Diglin/Ricento/Helper/Price.php +35 -10
- app/code/community/Diglin/Ricento/Helper/Support.php +15 -17
- app/code/community/Diglin/Ricento/Model/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Model/Config/Source/Status.php +4 -0
- app/code/community/Diglin/Ricento/Model/Config/Source/Watermark.php +46 -0
- app/code/community/Diglin/Ricento/Model/Dispatcher/Closed.php +67 -37
- app/code/community/Diglin/Ricento/Model/Dispatcher/List.php +5 -5
- app/code/community/Diglin/Ricento/Model/Dispatcher/Order.php +32 -26
- app/code/community/Diglin/Ricento/Model/Dispatcher/Stop.php +6 -1
- app/code/community/Diglin/Ricento/Model/Entity/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Model/Feed.php +74 -0
- app/code/community/Diglin/Ricento/Model/Products/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Model/Products/Listing/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Model/Products/Listing/Item.php +13 -24
- app/code/community/Diglin/Ricento/Model/Resource/Products/Listing.php +7 -8
- app/code/community/Diglin/Ricento/Model/Sales/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/Test/Model/Feed.php +37 -0
- app/code/community/Diglin/Ricento/controllers/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/CategoryController.php +0 -3
- app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/Listing/ItemController.php +1 -1
- app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/ListingController.php +8 -6
- app/code/community/Diglin/Ricento/data/.DS_Store +0 -0
- app/code/community/Diglin/Ricento/etc/adminhtml.xml +10 -2
- app/code/community/Diglin/Ricento/etc/config.xml +20 -1
- app/code/community/Diglin/Ricento/etc/system.xml +178 -88
- app/code/community/Diglin/Ricento/sql/ricento_setup/{upgrade-1.1.0-1.1.2.php → upgrade-1.1.2-1.1.3.php} +0 -0
- app/locale/de_CH/Diglin_Ricento.csv +11 -2
- app/locale/de_DE/Diglin_Ricento.csv +11 -2
- app/locale/de_DE/template/email/ricento/token_expiration.html +2 -2
- app/locale/en_US/Diglin_Ricento.csv +10 -1
- app/locale/fr_FR/Diglin_Ricento.csv +11 -1
- js/ricento/adminhtml.js +8 -9
- lib/Diglin/Ricardo/.DS_Store +0 -0
- lib/Diglin/Ricardo/Api.php +3 -1
- lib/Diglin/Ricardo/Core/Helper.php +1 -1
- lib/Diglin/Ricardo/Exceptions/TechnicalException.php +28 -0
- package.xml +17 -5
app/code/community/Diglin/Ricento/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Block/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Block/Adminhtml/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Block/Adminhtml/Form/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Block/Adminhtml/Form/Element/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Edit/Tabs/General.php
CHANGED
|
@@ -108,8 +108,9 @@ class Diglin_Ricento_Block_Adminhtml_Products_Listing_Edit_Tabs_General
|
|
| 108 |
|
| 109 |
$html .= '<script type="text/javascript">';
|
| 110 |
$html .= 'var generalForm = new Ricento.GeneralForm("' . $htmlIdPrefix . '");';
|
| 111 |
-
|
| 112 |
-
|
|
|
|
| 113 |
$html .= '</script>';
|
| 114 |
return parent::_afterToHtml($html);
|
| 115 |
}
|
| 108 |
|
| 109 |
$html .= '<script type="text/javascript">';
|
| 110 |
$html .= 'var generalForm = new Ricento.GeneralForm("' . $htmlIdPrefix . '");';
|
| 111 |
+
$html .= "\n";
|
| 112 |
+
!$this->isReadonlyForm() && $html .= 'setTimeout(function() {var publishLanguages = $(\'' . $htmlIdPrefix . 'publish_languages\');
|
| 113 |
+
generalForm.onChangeInput(publishLanguages, [\''. implode('\',\'', $languages) .'\'])}, 3000);';
|
| 114 |
$html .= '</script>';
|
| 115 |
return parent::_afterToHtml($html);
|
| 116 |
}
|
app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Grid/Renderer/Status.php
CHANGED
|
@@ -29,12 +29,12 @@ class Diglin_Ricento_Block_Adminhtml_Products_Listing_Grid_Renderer_Status
|
|
| 29 |
$sqlListed = $readAdapter->select()
|
| 30 |
->from($resourceModel->getTable('diglin_ricento/products_listing_item'), new Zend_Db_Expr('COUNT(*)'))
|
| 31 |
->where('products_listing_id = ?', $row->getId())
|
| 32 |
-
->where('status
|
| 33 |
|
| 34 |
$sqlNotListed = $readAdapter->select()
|
| 35 |
->from($resourceModel->getTable('diglin_ricento/products_listing_item'), new Zend_Db_Expr('COUNT(*)'))
|
| 36 |
->where('products_listing_id = ?', $row->getId())
|
| 37 |
-
->where('status
|
| 38 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE);
|
| 39 |
|
| 40 |
$totalListed = $readAdapter->fetchOne($sqlListed);
|
| 29 |
$sqlListed = $readAdapter->select()
|
| 30 |
->from($resourceModel->getTable('diglin_ricento/products_listing_item'), new Zend_Db_Expr('COUNT(*)'))
|
| 31 |
->where('products_listing_id = ?', $row->getId())
|
| 32 |
+
->where('status IN (?)', array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD));
|
| 33 |
|
| 34 |
$sqlNotListed = $readAdapter->select()
|
| 35 |
->from($resourceModel->getTable('diglin_ricento/products_listing_item'), new Zend_Db_Expr('COUNT(*)'))
|
| 36 |
->where('products_listing_id = ?', $row->getId())
|
| 37 |
+
->where('status NOT IN (?)', array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD))
|
| 38 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE);
|
| 39 |
|
| 40 |
$totalListed = $readAdapter->fetchOne($sqlListed);
|
app/code/community/Diglin/Ricento/Block/Adminhtml/Products/Listing/Item/Preview.php
CHANGED
|
@@ -340,24 +340,31 @@ class Diglin_Ricento_Block_Adminhtml_Products_Listing_Item_Preview extends Mage_
|
|
| 340 |
public function getProductImage()
|
| 341 |
{
|
| 342 |
try {
|
| 343 |
-
return '<img src="' . Mage::helper('
|
| 344 |
} catch (Exception $e) {
|
| 345 |
Mage::logException($e);
|
| 346 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 347 |
}
|
| 348 |
-
|
| 349 |
-
return '';
|
| 350 |
}
|
| 351 |
|
| 352 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 353 |
{
|
| 354 |
try {
|
| 355 |
-
return '<img src="' . $this->helper('
|
| 356 |
} catch (Exception $e) {
|
| 357 |
Mage::logException($e);
|
| 358 |
-
|
| 359 |
}
|
| 360 |
-
|
| 361 |
-
return '';
|
| 362 |
}
|
| 363 |
}
|
| 340 |
public function getProductImage()
|
| 341 |
{
|
| 342 |
try {
|
| 343 |
+
return '<img src="' . Mage::helper('diglin_ricento/image')->init($this->getProduct(), 'image')->resize(600)->getUrl(). '" width="265px" />';
|
| 344 |
} catch (Exception $e) {
|
| 345 |
Mage::logException($e);
|
| 346 |
+
$galleryImages = $this->getGalleryImages();
|
| 347 |
+
if (count($galleryImages)) {
|
| 348 |
+
$image = array_shift($galleryImages->getItems());
|
| 349 |
+
if ($image instanceof Varien_Object) {
|
| 350 |
+
return '<img src="' . Mage::helper('diglin_ricento/image')->init($this->getProduct(), 'image', $image->getFile())->resize(600)->getUrl(). '" width="265px" />';
|
| 351 |
+
}
|
| 352 |
+
}
|
| 353 |
+
return $e->getMessage();
|
| 354 |
}
|
|
|
|
|
|
|
| 355 |
}
|
| 356 |
|
| 357 |
+
/**
|
| 358 |
+
* @param Varien_Object $_image
|
| 359 |
+
* @return string
|
| 360 |
+
*/
|
| 361 |
+
public function getProductImageThumbnail(Varien_Object $_image)
|
| 362 |
{
|
| 363 |
try {
|
| 364 |
+
return '<img src="' . $this->helper('diglin_ricento/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(600)->getUrl() . '" width="56" height="56" alt="' . $this->escapeHtml($_image->getLabel()) . '" />';
|
| 365 |
} catch (Exception $e) {
|
| 366 |
Mage::logException($e);
|
| 367 |
+
return $e->getMessage();
|
| 368 |
}
|
|
|
|
|
|
|
| 369 |
}
|
| 370 |
}
|
app/code/community/Diglin/Ricento/Controller/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Controller/Adminhtml/Products/Listing.php
CHANGED
|
@@ -75,7 +75,7 @@ abstract class Diglin_Ricento_Controller_Adminhtml_Products_Listing extends Digl
|
|
| 75 |
}
|
| 76 |
if (!empty($data['sales_options']['schedule_date_start_immediately'])) {
|
| 77 |
$data['sales_options']['schedule_date_start'] = null;
|
| 78 |
-
} else {
|
| 79 |
$data['sales_options']['schedule_date_start'] = Mage::app()->getLocale()->utcDate(null, $data['sales_options']['schedule_date_start'], true)->toString(Varien_Date::DATETIME_INTERNAL_FORMAT);
|
| 80 |
}
|
| 81 |
if (!empty($data['sales_options']['schedule_period_use_end_date'])) {
|
| 75 |
}
|
| 76 |
if (!empty($data['sales_options']['schedule_date_start_immediately'])) {
|
| 77 |
$data['sales_options']['schedule_date_start'] = null;
|
| 78 |
+
} else if (isset($data['sales_options']['schedule_date_start'])) {
|
| 79 |
$data['sales_options']['schedule_date_start'] = Mage::app()->getLocale()->utcDate(null, $data['sales_options']['schedule_date_start'], true)->toString(Varien_Date::DATETIME_INTERNAL_FORMAT);
|
| 80 |
}
|
| 81 |
if (!empty($data['sales_options']['schedule_period_use_end_date'])) {
|
app/code/community/Diglin/Ricento/Helper/Data.php
CHANGED
|
@@ -42,6 +42,7 @@ class Diglin_Ricento_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 42 |
const LANG_ALL = 'all';
|
| 43 |
|
| 44 |
const ALLOWED_CURRENCY = 'CHF';
|
|
|
|
| 45 |
|
| 46 |
/**
|
| 47 |
* Global config
|
|
@@ -57,12 +58,19 @@ class Diglin_Ricento_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 57 |
const CFG_STATS_TEST_MODE = 'ricento/global/stats_test_mode';
|
| 58 |
const CFG_STATS_APPID = 'ricento/global/stats_app_id';
|
| 59 |
const CFG_STATS_APPID_TEST = 'ricento/global/stats_app_id_test';
|
|
|
|
| 60 |
|
| 61 |
/**
|
| 62 |
* Listing config
|
| 63 |
*/
|
| 64 |
const CFG_MERGE_DESCRIPTIONS = 'ricento/listing/merge_descriptions';
|
| 65 |
const CFG_NL2BR = 'ricento/listing/nl2br';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
|
| 67 |
/**
|
| 68 |
* Cleanup Job config
|
|
@@ -865,4 +873,13 @@ class Diglin_Ricento_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 865 |
|
| 866 |
return $store;
|
| 867 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 868 |
}
|
| 42 |
const LANG_ALL = 'all';
|
| 43 |
|
| 44 |
const ALLOWED_CURRENCY = 'CHF';
|
| 45 |
+
const DEFAULT_COUNTRY_CODE = 'CH';
|
| 46 |
|
| 47 |
/**
|
| 48 |
* Global config
|
| 58 |
const CFG_STATS_TEST_MODE = 'ricento/global/stats_test_mode';
|
| 59 |
const CFG_STATS_APPID = 'ricento/global/stats_app_id';
|
| 60 |
const CFG_STATS_APPID_TEST = 'ricento/global/stats_app_id_test';
|
| 61 |
+
const CFG_UPDATE_NOTIFICATION = 'ricento/global/update_notification';
|
| 62 |
|
| 63 |
/**
|
| 64 |
* Listing config
|
| 65 |
*/
|
| 66 |
const CFG_MERGE_DESCRIPTIONS = 'ricento/listing/merge_descriptions';
|
| 67 |
const CFG_NL2BR = 'ricento/listing/nl2br';
|
| 68 |
+
const CFG_WATERMARK_ENABLED = 'ricento/listing/watermark_enabled';
|
| 69 |
+
const CFG_WATERMARK = 'ricento/listing/watermark_image';
|
| 70 |
+
const CFG_WATERMARK_OPACITY = 'ricento/listing/watermark_imageOpacity';
|
| 71 |
+
const CFG_WATERMARK_POSITION = 'ricento/listing/watermark_position';
|
| 72 |
+
const CFG_WATERMARK_SIZE = 'ricento/listing/watermark_size';
|
| 73 |
+
const CFG_IMAGE_PLACEHOLDER = 'ricento/listing/placeholder_allowed';
|
| 74 |
|
| 75 |
/**
|
| 76 |
* Cleanup Job config
|
| 873 |
|
| 874 |
return $store;
|
| 875 |
}
|
| 876 |
+
|
| 877 |
+
/**
|
| 878 |
+
* @param null $store
|
| 879 |
+
* @return bool
|
| 880 |
+
*/
|
| 881 |
+
public function canNotifyUpdate($store = null)
|
| 882 |
+
{
|
| 883 |
+
return Mage::getStoreConfigFlag(self::CFG_UPDATE_NOTIFICATION, $store);
|
| 884 |
+
}
|
| 885 |
}
|
app/code/community/Diglin/Ricento/Helper/Image.php
CHANGED
|
@@ -14,16 +14,46 @@
|
|
| 14 |
*/
|
| 15 |
class Diglin_Ricento_Helper_Image extends Mage_Catalog_Helper_Image
|
| 16 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
/**
|
| 18 |
* @return int
|
| 19 |
*/
|
| 20 |
protected function getWatermarkImageOpacity()
|
| 21 |
{
|
| 22 |
if ($this->_watermarkImageOpacity) {
|
| 23 |
-
return (int)
|
| 24 |
}
|
| 25 |
|
| 26 |
-
return (int)
|
| 27 |
}
|
| 28 |
|
| 29 |
/**
|
|
@@ -31,6 +61,8 @@ class Diglin_Ricento_Helper_Image extends Mage_Catalog_Helper_Image
|
|
| 31 |
*/
|
| 32 |
public function __toString()
|
| 33 |
{
|
|
|
|
|
|
|
| 34 |
try {
|
| 35 |
$model = $this->_getModel();
|
| 36 |
|
|
@@ -59,8 +91,42 @@ class Diglin_Ricento_Helper_Image extends Mage_Catalog_Helper_Image
|
|
| 59 |
}
|
| 60 |
} catch (Exception $e) {
|
| 61 |
Mage::logException($e);
|
| 62 |
-
|
|
|
|
|
|
|
|
|
|
| 63 |
}
|
| 64 |
return $file;
|
| 65 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
}
|
| 14 |
*/
|
| 15 |
class Diglin_Ricento_Helper_Image extends Mage_Catalog_Helper_Image
|
| 16 |
{
|
| 17 |
+
/**
|
| 18 |
+
* @param Mage_Catalog_Model_Product $product
|
| 19 |
+
* @param string $attributeName
|
| 20 |
+
* @param null $imageFile
|
| 21 |
+
* @return $this
|
| 22 |
+
*/
|
| 23 |
+
public function init(Mage_Catalog_Model_Product $product, $attributeName, $imageFile = null)
|
| 24 |
+
{
|
| 25 |
+
parent::init($product, $attributeName, $imageFile);
|
| 26 |
+
|
| 27 |
+
if ($attributeName == 'image' && Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK_ENABLED) == Diglin_Ricento_Model_Config_Source_Watermark::YES) {
|
| 28 |
+
$this->setWatermark(
|
| 29 |
+
Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK)
|
| 30 |
+
);
|
| 31 |
+
$this->setWatermarkImageOpacity(
|
| 32 |
+
Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK_OPACITY)
|
| 33 |
+
);
|
| 34 |
+
$this->setWatermarkPosition(
|
| 35 |
+
Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK_POSITION)
|
| 36 |
+
);
|
| 37 |
+
$this->setWatermarkSize(
|
| 38 |
+
Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK_SIZE)
|
| 39 |
+
);
|
| 40 |
+
} else if ($attributeName == 'image' && Mage::getStoreConfig(Diglin_Ricento_Helper_Data::CFG_WATERMARK_ENABLED) == Diglin_Ricento_Model_Config_Source_Watermark::NO) {
|
| 41 |
+
$this->setWatermark(null);
|
| 42 |
+
}
|
| 43 |
+
|
| 44 |
+
return $this;
|
| 45 |
+
}
|
| 46 |
+
|
| 47 |
/**
|
| 48 |
* @return int
|
| 49 |
*/
|
| 50 |
protected function getWatermarkImageOpacity()
|
| 51 |
{
|
| 52 |
if ($this->_watermarkImageOpacity) {
|
| 53 |
+
return (int)$this->_watermarkImageOpacity;
|
| 54 |
}
|
| 55 |
|
| 56 |
+
return (int)$this->_getModel()->getWatermarkImageOpacity();
|
| 57 |
}
|
| 58 |
|
| 59 |
/**
|
| 61 |
*/
|
| 62 |
public function __toString()
|
| 63 |
{
|
| 64 |
+
$file = '';
|
| 65 |
+
|
| 66 |
try {
|
| 67 |
$model = $this->_getModel();
|
| 68 |
|
| 91 |
}
|
| 92 |
} catch (Exception $e) {
|
| 93 |
Mage::logException($e);
|
| 94 |
+
|
| 95 |
+
if (Mage::getStoreConfigFlag(Diglin_Ricento_Helper_Data::CFG_IMAGE_PLACEHOLDER)) {
|
| 96 |
+
$file = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
|
| 97 |
+
}
|
| 98 |
}
|
| 99 |
return $file;
|
| 100 |
}
|
| 101 |
+
|
| 102 |
+
/**
|
| 103 |
+
* @return string
|
| 104 |
+
*/
|
| 105 |
+
public function getUrl()
|
| 106 |
+
{
|
| 107 |
+
return parent::__toString();
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
/**
|
| 111 |
+
* @param string $filepath
|
| 112 |
+
* @param Mage_Catalog_Model_Product $product
|
| 113 |
+
* @return bool|string
|
| 114 |
+
*/
|
| 115 |
+
public function prepareRicardoPicture($filepath, Mage_Catalog_Model_Product $product = null)
|
| 116 |
+
{
|
| 117 |
+
if ($filepath == 'no_selection') {
|
| 118 |
+
return false;
|
| 119 |
+
}
|
| 120 |
+
|
| 121 |
+
if (is_null($product)) {
|
| 122 |
+
$product = new Mage_Catalog_Model_Product();
|
| 123 |
+
}
|
| 124 |
+
|
| 125 |
+
return $this->init($product, 'image', $filepath)
|
| 126 |
+
->keepAspectRatio(true)
|
| 127 |
+
->keepFrame(false)
|
| 128 |
+
->setQuality(90)
|
| 129 |
+
->resize(600)
|
| 130 |
+
->__toString();
|
| 131 |
+
}
|
| 132 |
}
|
app/code/community/Diglin/Ricento/Helper/Price.php
CHANGED
|
@@ -46,16 +46,6 @@ class Diglin_Ricento_Helper_Price extends Mage_Core_Helper_Abstract
|
|
| 46 |
*/
|
| 47 |
public function startCurrencyEmulation($websiteId = null)
|
| 48 |
{
|
| 49 |
-
// $partnerConfiguration = Mage::getSingleton('diglin_ricento/api_services_system')
|
| 50 |
-
// ->setCurrentWebsite($websiteId)
|
| 51 |
-
// ->getPartnerConfigurations();
|
| 52 |
-
//
|
| 53 |
-
// if (isset($partnerConfiguration['CurrencyPrefix'])) {
|
| 54 |
-
// $ricardoCurrency = $partnerConfiguration['CurrencyPrefix'];
|
| 55 |
-
// } else {
|
| 56 |
-
// $ricardoCurrency = Diglin_Ricento_Helper_Data::ALLOWED_CURRENCY;
|
| 57 |
-
// }
|
| 58 |
-
|
| 59 |
$store = Mage::helper('diglin_ricento')->getDefaultStore($websiteId);
|
| 60 |
|
| 61 |
if ($store->getCurrentCurrency()->getCode() != Diglin_Ricento_Helper_Data::ALLOWED_CURRENCY) {
|
|
@@ -216,4 +206,39 @@ class Diglin_Ricento_Helper_Price extends Mage_Core_Helper_Abstract
|
|
| 216 |
|
| 217 |
return $this->_currencyCache[$currencyCode];
|
| 218 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 219 |
}
|
| 46 |
*/
|
| 47 |
public function startCurrencyEmulation($websiteId = null)
|
| 48 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
$store = Mage::helper('diglin_ricento')->getDefaultStore($websiteId);
|
| 50 |
|
| 51 |
if ($store->getCurrentCurrency()->getCode() != Diglin_Ricento_Helper_Data::ALLOWED_CURRENCY) {
|
| 206 |
|
| 207 |
return $this->_currencyCache[$currencyCode];
|
| 208 |
}
|
| 209 |
+
|
| 210 |
+
/**
|
| 211 |
+
* Method to trick Magento Price calculation during order creation
|
| 212 |
+
* because the tax is subtracted from ricardo.ch prices when the shop is outside Switzerland and customer is Swiss
|
| 213 |
+
* although sold price doesn't have to be modified
|
| 214 |
+
*
|
| 215 |
+
* @param $product
|
| 216 |
+
* @param $price
|
| 217 |
+
* @param Mage_Core_Model_Store $store
|
| 218 |
+
* @param Mage_Sales_Model_Quote $quote
|
| 219 |
+
* @return float
|
| 220 |
+
*/
|
| 221 |
+
public function getPriceWithOrWithoutTax($product, $price, Mage_Core_Model_Store $store, Mage_Sales_Model_Quote $quote)
|
| 222 |
+
{
|
| 223 |
+
$priceIncludeTax = true;
|
| 224 |
+
$defaultCountry = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY, $store);
|
| 225 |
+
|
| 226 |
+
if ($defaultCountry != Diglin_Ricento_Helper_Data::DEFAULT_COUNTRY_CODE
|
| 227 |
+
&& $quote->getBillingAddress()->getCountryId() == Diglin_Ricento_Helper_Data::DEFAULT_COUNTRY_CODE
|
| 228 |
+
) {
|
| 229 |
+
$priceIncludeTax = false;
|
| 230 |
+
}
|
| 231 |
+
|
| 232 |
+
return (float) Mage::helper('tax')->getPrice(
|
| 233 |
+
$product,
|
| 234 |
+
$price,
|
| 235 |
+
true, // price include tax
|
| 236 |
+
null, // Shipping Address
|
| 237 |
+
null, // Billing Address
|
| 238 |
+
$quote->getCustomer()->getTaxClassId(),
|
| 239 |
+
$store,
|
| 240 |
+
$priceIncludeTax, // return price include tax
|
| 241 |
+
false // Round Price
|
| 242 |
+
);
|
| 243 |
+
}
|
| 244 |
}
|
app/code/community/Diglin/Ricento/Helper/Support.php
CHANGED
|
@@ -111,30 +111,28 @@ class Diglin_Ricento_Helper_Support extends Mage_Core_Helper_Abstract
|
|
| 111 |
foreach ($tables as $key => $table) {
|
| 112 |
|
| 113 |
// Anonymize
|
| 114 |
-
$cols =
|
| 115 |
-
|
| 116 |
-
|
| 117 |
-
|
| 118 |
-
|
| 119 |
-
|
| 120 |
-
|
| 121 |
-
|
| 122 |
-
|
| 123 |
-
|
| 124 |
-
|
| 125 |
-
|
| 126 |
-
if ($found !== false) {
|
| 127 |
-
unset($cols[$found]);
|
| 128 |
-
}
|
| 129 |
}
|
| 130 |
|
| 131 |
$select = $read
|
| 132 |
->select()
|
| 133 |
->from($table, $cols)
|
| 134 |
-
->limit(
|
| 135 |
->order(array( substr($key, 0, -4) . ' DESC'));
|
| 136 |
|
| 137 |
$object = new Varien_Object($read->fetchAll($select));
|
|
|
|
| 138 |
$files[] = $this->writeFile($destination, $table . '.csv', $object->toArray(), true);
|
| 139 |
}
|
| 140 |
|
|
@@ -209,7 +207,7 @@ class Diglin_Ricento_Helper_Support extends Mage_Core_Helper_Abstract
|
|
| 209 |
$file = $destination . DS . $filename;
|
| 210 |
$ioFile = new Varien_Io_File();
|
| 211 |
$ioFile->cd($destination);
|
| 212 |
-
$ioFile->streamOpen($file);
|
| 213 |
if ($csv) {
|
| 214 |
foreach ($content as $row) {
|
| 215 |
$ioFile->streamWriteCsv($row);
|
| 111 |
foreach ($tables as $key => $table) {
|
| 112 |
|
| 113 |
// Anonymize
|
| 114 |
+
$cols = $read->fetchCol('describe ' . $table);
|
| 115 |
+
$found = array_search('customer_email', $cols);
|
| 116 |
+
if ($found !== false) {
|
| 117 |
+
unset($cols[$found]);
|
| 118 |
+
}
|
| 119 |
+
$found = array_search('customer_firstname', $cols);
|
| 120 |
+
if ($found !== false) {
|
| 121 |
+
unset($cols[$found]);
|
| 122 |
+
}
|
| 123 |
+
$found = array_search('customer_lastname', $cols);
|
| 124 |
+
if ($found !== false) {
|
| 125 |
+
unset($cols[$found]);
|
|
|
|
|
|
|
|
|
|
| 126 |
}
|
| 127 |
|
| 128 |
$select = $read
|
| 129 |
->select()
|
| 130 |
->from($table, $cols)
|
| 131 |
+
->limit(2000)
|
| 132 |
->order(array( substr($key, 0, -4) . ' DESC'));
|
| 133 |
|
| 134 |
$object = new Varien_Object($read->fetchAll($select));
|
| 135 |
+
$this->writeFile($destination, $table . '.csv', array($cols), true);
|
| 136 |
$files[] = $this->writeFile($destination, $table . '.csv', $object->toArray(), true);
|
| 137 |
}
|
| 138 |
|
| 207 |
$file = $destination . DS . $filename;
|
| 208 |
$ioFile = new Varien_Io_File();
|
| 209 |
$ioFile->cd($destination);
|
| 210 |
+
$ioFile->streamOpen($file, 'a+');
|
| 211 |
if ($csv) {
|
| 212 |
foreach ($content as $row) {
|
| 213 |
$ioFile->streamWriteCsv($row);
|
app/code/community/Diglin/Ricento/Model/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Model/Config/Source/Status.php
CHANGED
|
@@ -48,6 +48,10 @@ class Diglin_Ricento_Model_Config_Source_Status extends Diglin_Ricento_Model_Con
|
|
| 48 |
array(
|
| 49 |
'value' => Diglin_Ricento_Helper_Data::STATUS_READY,
|
| 50 |
'label' => $helper->__('Ready to list')
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
)
|
| 52 |
);
|
| 53 |
}
|
| 48 |
array(
|
| 49 |
'value' => Diglin_Ricento_Helper_Data::STATUS_READY,
|
| 50 |
'label' => $helper->__('Ready to list')
|
| 51 |
+
),
|
| 52 |
+
array(
|
| 53 |
+
'value' => Diglin_Ricento_Helper_Data::STATUS_SOLD,
|
| 54 |
+
'label' => $helper->__('Sold')
|
| 55 |
)
|
| 56 |
);
|
| 57 |
}
|
app/code/community/Diglin/Ricento/Model/Config/Source/Watermark.php
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ricardo.ch AG - Switzerland
|
| 4 |
+
*
|
| 5 |
+
* @author Sylvain Rayé <support at diglin.com>
|
| 6 |
+
* @category Diglin
|
| 7 |
+
* @package Diglin_Ricento
|
| 8 |
+
* @copyright Copyright (c) 2015 ricardo.ch AG (http://www.ricardo.ch)
|
| 9 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 10 |
+
*/
|
| 11 |
+
|
| 12 |
+
/**
|
| 13 |
+
* Class Diglin_Ricento_Model_Config_Source_Watermark
|
| 14 |
+
*/
|
| 15 |
+
class Diglin_Ricento_Model_Config_Source_Watermark
|
| 16 |
+
{
|
| 17 |
+
const NO = 0;
|
| 18 |
+
const YES = 1;
|
| 19 |
+
const DEFAULT_CONFIG = 2;
|
| 20 |
+
|
| 21 |
+
/**
|
| 22 |
+
* This method is used for the massaction for example
|
| 23 |
+
*
|
| 24 |
+
* @return array
|
| 25 |
+
*/
|
| 26 |
+
public function toOptionArray()
|
| 27 |
+
{
|
| 28 |
+
$helper = Mage::helper('diglin_ricento');
|
| 29 |
+
|
| 30 |
+
return array(
|
| 31 |
+
|
| 32 |
+
array(
|
| 33 |
+
'value' => 0,
|
| 34 |
+
'label' => $helper->__('No')
|
| 35 |
+
),
|
| 36 |
+
array(
|
| 37 |
+
'value' => 1,
|
| 38 |
+
'label' => $helper->__('Yes')
|
| 39 |
+
),
|
| 40 |
+
array(
|
| 41 |
+
'value' => 2,
|
| 42 |
+
'label' => $helper->__('Use default store configuration')
|
| 43 |
+
)
|
| 44 |
+
);
|
| 45 |
+
}
|
| 46 |
+
}
|
app/code/community/Diglin/Ricento/Model/Dispatcher/Closed.php
CHANGED
|
@@ -1,11 +1,12 @@
|
|
| 1 |
<?php
|
| 2 |
/**
|
| 3 |
-
*
|
| 4 |
*
|
| 5 |
-
* @author Sylvain Rayé <
|
| 6 |
-
* @category
|
| 7 |
-
* @package
|
| 8 |
-
* @copyright Copyright (c)
|
|
|
|
| 9 |
*/
|
| 10 |
|
| 11 |
use \Diglin\Ricardo\Managers\SellerAccount\Parameter\OpenArticlesParameter;
|
|
@@ -28,7 +29,7 @@ class Diglin_Ricento_Model_Dispatcher_Closed extends Diglin_Ricento_Model_Dispat
|
|
| 28 |
/**
|
| 29 |
* @var array
|
| 30 |
*/
|
| 31 |
-
protected $
|
| 32 |
|
| 33 |
public function proceed()
|
| 34 |
{
|
|
@@ -45,9 +46,10 @@ class Diglin_Ricento_Model_Dispatcher_Closed extends Diglin_Ricento_Model_Dispat
|
|
| 45 |
->select()
|
| 46 |
->from(array('pli' => $plResource->getTable('diglin_ricento/products_listing_item')), 'item_id')
|
| 47 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
|
| 48 |
-
->where('products_listing_id = :id AND
|
|
|
|
| 49 |
|
| 50 |
-
$binds = array('id' => $listingId
|
| 51 |
$countListedItems = count($readConnection->fetchAll($select, $binds));
|
| 52 |
|
| 53 |
if ($countListedItems == 0) {
|
|
@@ -101,58 +103,87 @@ class Diglin_Ricento_Model_Dispatcher_Closed extends Diglin_Ricento_Model_Dispat
|
|
| 101 |
/**
|
| 102 |
* Status of the collection must be the same as Diglin_Ricento_Model_Resource_Products_Listing_Item::countReadyTolist
|
| 103 |
*/
|
| 104 |
-
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED), $this->_currentJobListing->getLastItemId());
|
| 105 |
$itemCollection->addFieldToFilter('is_planned', 0);
|
| 106 |
-
$totalItems = $itemCollection->getSize();
|
| 107 |
-
$ricardoArticleIds = $itemCollection->getColumnValues('ricardo_article_id');
|
| 108 |
-
$lastItem = $itemCollection->getLastItem();
|
| 109 |
-
$soldArticlesResult = $stoppedArticles = array();
|
| 110 |
|
|
|
|
| 111 |
if (!$totalItems) {
|
| 112 |
$this->_currentJob->setJobMessage(array($this->_getNoItemMessage()));
|
| 113 |
$this->_progressStatus = Diglin_Ricento_Model_Sync_Job::PROGRESS_COMPLETED;
|
| 114 |
return $this;
|
| 115 |
}
|
| 116 |
|
| 117 |
-
$
|
| 118 |
-
$
|
| 119 |
-
|
| 120 |
-
->setArticleIdsFilter($ricardoArticleIds);
|
| 121 |
|
| 122 |
$sellerAccountService = Mage::getSingleton('diglin_ricento/api_services_selleraccount')->setCanUseCache(false);
|
| 123 |
$sellerAccountService->setCurrentWebsite($this->_getListing()->getWebsiteId());
|
| 124 |
|
| 125 |
try {
|
| 126 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 127 |
} catch (Exception $e) {
|
| 128 |
$this->_handleException($e);
|
| 129 |
$e = null;
|
| 130 |
// keep going for the next item - no break
|
| 131 |
}
|
| 132 |
|
| 133 |
-
if (isset($
|
| 134 |
-
|
|
|
|
| 135 |
$stoppedArticles = array_filter($ricardoArticleIds, array($this, 'pullArticleToClose'));
|
|
|
|
| 136 |
if (count($stoppedArticles)) {
|
| 137 |
$itemCollection = Mage::getResourceModel('diglin_ricento/products_listing_item_collection');
|
| 138 |
$itemCollection->addFieldToFilter('ricardo_article_id', array('in' => $stoppedArticles));
|
| 139 |
|
| 140 |
foreach ($itemCollection->getItems() as $item) {
|
| 141 |
|
| 142 |
-
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
| 146 |
-
|
| 147 |
-
|
| 148 |
-
|
| 149 |
-
|
| 150 |
-
|
| 151 |
-
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
|
| 155 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 156 |
}
|
| 157 |
}
|
| 158 |
}
|
|
@@ -170,8 +201,7 @@ class Diglin_Ricento_Model_Dispatcher_Closed extends Diglin_Ricento_Model_Dispat
|
|
| 170 |
* Stop the list if all products listing items are stopped
|
| 171 |
*/
|
| 172 |
if ($this->_productsListingId) {
|
| 173 |
-
|
| 174 |
-
$listResource->setStatusStop($this->_productsListingId);
|
| 175 |
}
|
| 176 |
|
| 177 |
unset($itemCollection);
|
|
@@ -186,7 +216,7 @@ class Diglin_Ricento_Model_Dispatcher_Closed extends Diglin_Ricento_Model_Dispat
|
|
| 186 |
public function pullArticleToClose($var)
|
| 187 |
{
|
| 188 |
$return = true;
|
| 189 |
-
foreach ($this->
|
| 190 |
if ($var == $articleId['ArticleId']) {
|
| 191 |
return false;
|
| 192 |
}
|
| 1 |
<?php
|
| 2 |
/**
|
| 3 |
+
* ricardo.ch AG - Switzerland
|
| 4 |
*
|
| 5 |
+
* @author Sylvain Rayé <support at diglin.com>
|
| 6 |
+
* @category Diglin
|
| 7 |
+
* @package Diglin_Ricento
|
| 8 |
+
* @copyright Copyright (c) 2015 ricardo.ch AG (http://www.ricardo.ch)
|
| 9 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 10 |
*/
|
| 11 |
|
| 12 |
use \Diglin\Ricardo\Managers\SellerAccount\Parameter\OpenArticlesParameter;
|
| 29 |
/**
|
| 30 |
* @var array
|
| 31 |
*/
|
| 32 |
+
protected $_openRicardoArticleIds = array();
|
| 33 |
|
| 34 |
public function proceed()
|
| 35 |
{
|
| 46 |
->select()
|
| 47 |
->from(array('pli' => $plResource->getTable('diglin_ricento/products_listing_item')), 'item_id')
|
| 48 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
|
| 49 |
+
->where('products_listing_id = :id AND is_planned = 0')
|
| 50 |
+
->where('status IN (?)', array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD));
|
| 51 |
|
| 52 |
+
$binds = array('id' => $listingId);
|
| 53 |
$countListedItems = count($readConnection->fetchAll($select, $binds));
|
| 54 |
|
| 55 |
if ($countListedItems == 0) {
|
| 103 |
/**
|
| 104 |
* Status of the collection must be the same as Diglin_Ricento_Model_Resource_Products_Listing_Item::countReadyTolist
|
| 105 |
*/
|
| 106 |
+
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD), $this->_currentJobListing->getLastItemId());
|
| 107 |
$itemCollection->addFieldToFilter('is_planned', 0);
|
|
|
|
|
|
|
|
|
|
|
|
|
| 108 |
|
| 109 |
+
$totalItems = $itemCollection->getSize();
|
| 110 |
if (!$totalItems) {
|
| 111 |
$this->_currentJob->setJobMessage(array($this->_getNoItemMessage()));
|
| 112 |
$this->_progressStatus = Diglin_Ricento_Model_Sync_Job::PROGRESS_COMPLETED;
|
| 113 |
return $this;
|
| 114 |
}
|
| 115 |
|
| 116 |
+
$ricardoArticleIds = $itemCollection->getColumnValues('ricardo_article_id');
|
| 117 |
+
$lastItem = $itemCollection->getLastItem();
|
| 118 |
+
$openArticlesResult = $stoppedArticles = array();
|
|
|
|
| 119 |
|
| 120 |
$sellerAccountService = Mage::getSingleton('diglin_ricento/api_services_selleraccount')->setCanUseCache(false);
|
| 121 |
$sellerAccountService->setCurrentWebsite($this->_getListing()->getWebsiteId());
|
| 122 |
|
| 123 |
try {
|
| 124 |
+
$openArticlesParameter = new OpenArticlesParameter();
|
| 125 |
+
$openArticlesParameter
|
| 126 |
+
->setPageSize($this->_limit) // if not defined, default is 10
|
| 127 |
+
->setArticleIdsFilter($ricardoArticleIds);
|
| 128 |
+
|
| 129 |
+
$openArticlesResult = $sellerAccountService->getOpenArticles($openArticlesParameter);
|
| 130 |
} catch (Exception $e) {
|
| 131 |
$this->_handleException($e);
|
| 132 |
$e = null;
|
| 133 |
// keep going for the next item - no break
|
| 134 |
}
|
| 135 |
|
| 136 |
+
if (isset($openArticlesResult['OpenArticles'])) {
|
| 137 |
+
|
| 138 |
+
$this->_openRicardoArticleIds = $openArticlesResult['OpenArticles'];
|
| 139 |
$stoppedArticles = array_filter($ricardoArticleIds, array($this, 'pullArticleToClose'));
|
| 140 |
+
|
| 141 |
if (count($stoppedArticles)) {
|
| 142 |
$itemCollection = Mage::getResourceModel('diglin_ricento/products_listing_item_collection');
|
| 143 |
$itemCollection->addFieldToFilter('ricardo_article_id', array('in' => $stoppedArticles));
|
| 144 |
|
| 145 |
foreach ($itemCollection->getItems() as $item) {
|
| 146 |
|
| 147 |
+
try {
|
| 148 |
+
// Check if the article is really stopped - Article Id may change if product has been sold but reactivated
|
| 149 |
+
$openArticlesParameter = new OpenArticlesParameter();
|
| 150 |
+
$openArticlesParameter->setInternalReferenceFilter($item->getInternalReference());
|
| 151 |
+
|
| 152 |
+
$openArticleResult = $sellerAccountService->getOpenArticles($openArticlesParameter);
|
| 153 |
+
} catch (Exception $e) {
|
| 154 |
+
$this->_handleException($e);
|
| 155 |
+
$e = null;
|
| 156 |
+
continue;
|
| 157 |
+
// keep going for the next item - no break
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
// We do not stop anything if the article ID has just been changed and the product is still open
|
| 161 |
+
if (isset($openArticleResult['TotalLines']) && $openArticleResult['TotalLines'] > 0) {
|
| 162 |
+
$articleId = $openArticleResult['OpenArticles'][0]['ArticleId'];
|
| 163 |
+
if ($item->getRicardoArticleId() != $articleId) {
|
| 164 |
+
$item
|
| 165 |
+
->setRicardoArticleId($articleId)
|
| 166 |
+
->save();
|
| 167 |
+
}
|
| 168 |
+
} else {
|
| 169 |
+
$item
|
| 170 |
+
->setRicardoArticleId(null)
|
| 171 |
+
->setQtyInventory(null)
|
| 172 |
+
->setIsPlanned(null)
|
| 173 |
+
->setStatus(Diglin_Ricento_Helper_Data::STATUS_STOPPED)
|
| 174 |
+
->save();
|
| 175 |
+
|
| 176 |
+
$this->_getListingLog()->saveLog(array(
|
| 177 |
+
'job_id' => $this->_currentJob->getId(),
|
| 178 |
+
'product_id' => $item->getProductId(),
|
| 179 |
+
'product_title' => $item->getProductTitle(),
|
| 180 |
+
'products_listing_id' => $this->_productsListingId,
|
| 181 |
+
'message' => $this->_jsonEncode(array('success' => $this->_getHelper()->__('The product has been stopped'))),
|
| 182 |
+
'log_status' => Diglin_Ricento_Model_Products_Listing_Log::STATUS_SUCCESS,
|
| 183 |
+
'log_type' => $this->_logType,
|
| 184 |
+
'created_at' => Mage::getSingleton('core/date')->gmtDate()
|
| 185 |
+
));
|
| 186 |
+
}
|
| 187 |
}
|
| 188 |
}
|
| 189 |
}
|
| 201 |
* Stop the list if all products listing items are stopped
|
| 202 |
*/
|
| 203 |
if ($this->_productsListingId) {
|
| 204 |
+
Mage::getResourceModel('diglin_ricento/products_listing')->setStatusStop($this->_productsListingId);
|
|
|
|
| 205 |
}
|
| 206 |
|
| 207 |
unset($itemCollection);
|
| 216 |
public function pullArticleToClose($var)
|
| 217 |
{
|
| 218 |
$return = true;
|
| 219 |
+
foreach ($this->_openRicardoArticleIds as $articleId) {
|
| 220 |
if ($var == $articleId['ArticleId']) {
|
| 221 |
return false;
|
| 222 |
}
|
app/code/community/Diglin/Ricento/Model/Dispatcher/List.php
CHANGED
|
@@ -59,14 +59,14 @@ class Diglin_Ricento_Model_Dispatcher_List extends Diglin_Ricento_Model_Dispatch
|
|
| 59 |
|
| 60 |
$baseInsert = $item->getBaseInsertArticleWithTracking();
|
| 61 |
$correlationItems[$baseInsert->getCorrelationKey()] = array(
|
| 62 |
-
'item_id'
|
| 63 |
'product_title' => $item->getProductTitle(),
|
| 64 |
-
'product_id'
|
| 65 |
-
'product_qty'
|
| 66 |
-
'skipped'
|
| 67 |
);
|
| 68 |
|
| 69 |
-
if (!$item->getRicardoArticleId()) {
|
| 70 |
$insertArticles->setArticles($baseInsert, $flush);
|
| 71 |
}
|
| 72 |
|
| 59 |
|
| 60 |
$baseInsert = $item->getBaseInsertArticleWithTracking();
|
| 61 |
$correlationItems[$baseInsert->getCorrelationKey()] = array(
|
| 62 |
+
'item_id' => $item->getId(),
|
| 63 |
'product_title' => $item->getProductTitle(),
|
| 64 |
+
'product_id' => $item->getProductId(),
|
| 65 |
+
'product_qty' => $item->getProductQty(),
|
| 66 |
+
'skipped' => (bool) ($item->getRicardoArticleId())
|
| 67 |
);
|
| 68 |
|
| 69 |
+
if (!$item->getRicardoArticleId()) { // skip still live article
|
| 70 |
$insertArticles->setArticles($baseInsert, $flush);
|
| 71 |
}
|
| 72 |
|
app/code/community/Diglin/Ricento/Model/Dispatcher/Order.php
CHANGED
|
@@ -46,9 +46,10 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 46 |
->select()
|
| 47 |
->from(array('pli' => $plResource->getTable('diglin_ricento/products_listing_item')), 'item_id')
|
| 48 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
|
| 49 |
-
->where('products_listing_id = :id AND
|
|
|
|
| 50 |
|
| 51 |
-
$binds = array('id' => $listingId
|
| 52 |
$countListedItems = count($readConnection->fetchAll($select, $binds));
|
| 53 |
|
| 54 |
if ($countListedItems == 0) {
|
|
@@ -102,7 +103,7 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 102 |
$article = null;
|
| 103 |
$soldArticles = array();
|
| 104 |
|
| 105 |
-
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED), $this->_currentJobListing->getLastItemId());
|
| 106 |
$itemCollection->addFieldToFilter('is_planned', 0);
|
| 107 |
|
| 108 |
$ricardoArticleIds = $itemCollection->getColumnValues('ricardo_article_id');
|
|
@@ -227,7 +228,7 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 227 |
$productItem->setLoadFallbackOptions(true);
|
| 228 |
}
|
| 229 |
|
| 230 |
-
if (!$productItem->getId() || $productItem->getStatus()
|
| 231 |
continue;
|
| 232 |
}
|
| 233 |
|
|
@@ -565,9 +566,6 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 565 |
// $order->setState(Mage_Sales_Model_Order::STATE_CANCELED, Diglin_Ricento_Helper_Data::ORDER_STATUS_CANCEL, $this->_getHelper()->__('Order canceled on ricardo.ch side'), false);
|
| 566 |
// }
|
| 567 |
|
| 568 |
-
// $quote->setIsActive(false);
|
| 569 |
-
// $quote->save();
|
| 570 |
-
|
| 571 |
/**
|
| 572 |
* Save the new order id to the ricardo transaction
|
| 573 |
*/
|
|
@@ -658,7 +656,7 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 658 |
->setIsRicardo(true)
|
| 659 |
->setRicardoTransactionId($transaction->getId())
|
| 660 |
->setShippingCumulativeFee($transaction->getShippingCumulativeFee())
|
| 661 |
-
->setShippingFee($this->getShippingFee($transaction, $store
|
| 662 |
|
| 663 |
$product = Mage::getModel('catalog/product')
|
| 664 |
->setStoreId($store->getId())
|
|
@@ -676,27 +674,37 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 676 |
Mage::throwException($quoteItem);
|
| 677 |
}
|
| 678 |
|
|
|
|
|
|
|
|
|
|
| 679 |
$quoteItem
|
| 680 |
// Set unit custom price
|
| 681 |
-
->setCustomPrice($
|
| 682 |
-
->setOriginalCustomPrice($
|
| 683 |
|
| 684 |
return true;
|
| 685 |
}
|
| 686 |
|
| 687 |
/**
|
| 688 |
* @param Diglin_Ricento_Model_Sales_Transaction $transaction
|
| 689 |
-
* @param
|
| 690 |
* @return float|int|null
|
| 691 |
*/
|
| 692 |
-
public function getShippingFee(Diglin_Ricento_Model_Sales_Transaction $transaction, $
|
| 693 |
{
|
| 694 |
$currency = $this->_getCurrency();
|
| 695 |
$shippingFee = $transaction->getShippingFee();
|
| 696 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 697 |
|
| 698 |
if ($baseCurrencyCode != $currency->getCode()) {
|
| 699 |
-
$shippingFee =
|
| 700 |
}
|
| 701 |
|
| 702 |
return $shippingFee;
|
|
@@ -728,20 +736,18 @@ class Diglin_Ricento_Model_Dispatcher_Order extends Diglin_Ricento_Model_Dispatc
|
|
| 728 |
->setShippingMethod(Diglin_Ricento_Model_Sales_Method_Shipping::SHIPPING_CODE . '_' . $shippingTransactionMethod)
|
| 729 |
->collectShippingRates();
|
| 730 |
|
| 731 |
-
$quote
|
| 732 |
-
|
| 733 |
-
|
| 734 |
-
array(
|
| 735 |
-
|
| 736 |
-
|
| 737 |
-
|
| 738 |
-
|
| 739 |
-
'ricardo_transaction_ids' => implode(',', $dispatchedTransactions),
|
| 740 |
-
'ricardo_bid_ids' => implode(',', array_keys($dispatchedTransactions)),
|
| 741 |
-
)
|
| 742 |
)
|
| 743 |
)
|
| 744 |
-
)
|
|
|
|
| 745 |
|
| 746 |
$quote
|
| 747 |
->addData(
|
| 46 |
->select()
|
| 47 |
->from(array('pli' => $plResource->getTable('diglin_ricento/products_listing_item')), 'item_id')
|
| 48 |
->where('type <> ?', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
|
| 49 |
+
->where('products_listing_id = :id AND is_planned = 0')
|
| 50 |
+
->where('status IN (?)', array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD));
|
| 51 |
|
| 52 |
+
$binds = array('id' => $listingId);
|
| 53 |
$countListedItems = count($readConnection->fetchAll($select, $binds));
|
| 54 |
|
| 55 |
if ($countListedItems == 0) {
|
| 103 |
$article = null;
|
| 104 |
$soldArticles = array();
|
| 105 |
|
| 106 |
+
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD), $this->_currentJobListing->getLastItemId());
|
| 107 |
$itemCollection->addFieldToFilter('is_planned', 0);
|
| 108 |
|
| 109 |
$ricardoArticleIds = $itemCollection->getColumnValues('ricardo_article_id');
|
| 228 |
$productItem->setLoadFallbackOptions(true);
|
| 229 |
}
|
| 230 |
|
| 231 |
+
if (!$productItem->getId() || (!in_array($productItem->getStatus(), array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))) {
|
| 232 |
continue;
|
| 233 |
}
|
| 234 |
|
| 566 |
// $order->setState(Mage_Sales_Model_Order::STATE_CANCELED, Diglin_Ricento_Helper_Data::ORDER_STATUS_CANCEL, $this->_getHelper()->__('Order canceled on ricardo.ch side'), false);
|
| 567 |
// }
|
| 568 |
|
|
|
|
|
|
|
|
|
|
| 569 |
/**
|
| 570 |
* Save the new order id to the ricardo transaction
|
| 571 |
*/
|
| 656 |
->setIsRicardo(true)
|
| 657 |
->setRicardoTransactionId($transaction->getId())
|
| 658 |
->setShippingCumulativeFee($transaction->getShippingCumulativeFee())
|
| 659 |
+
->setShippingFee($this->getShippingFee($transaction, $store, $quote));
|
| 660 |
|
| 661 |
$product = Mage::getModel('catalog/product')
|
| 662 |
->setStoreId($store->getId())
|
| 674 |
Mage::throwException($quoteItem);
|
| 675 |
}
|
| 676 |
|
| 677 |
+
$totalBidPrice = Mage::helper('diglin_ricento/price')
|
| 678 |
+
->getPriceWithOrWithoutTax($product, $transaction->getTotalBidPrice(), $store, $quote);
|
| 679 |
+
|
| 680 |
$quoteItem
|
| 681 |
// Set unit custom price
|
| 682 |
+
->setCustomPrice($totalBidPrice )
|
| 683 |
+
->setOriginalCustomPrice($totalBidPrice);
|
| 684 |
|
| 685 |
return true;
|
| 686 |
}
|
| 687 |
|
| 688 |
/**
|
| 689 |
* @param Diglin_Ricento_Model_Sales_Transaction $transaction
|
| 690 |
+
* @param Mage_Core_Model_Store $store
|
| 691 |
* @return float|int|null
|
| 692 |
*/
|
| 693 |
+
public function getShippingFee(Diglin_Ricento_Model_Sales_Transaction $transaction, Mage_Core_Model_Store $store, Mage_Sales_Model_Quote $quote)
|
| 694 |
{
|
| 695 |
$currency = $this->_getCurrency();
|
| 696 |
$shippingFee = $transaction->getShippingFee();
|
| 697 |
+
$helperPrice = Mage::helper('diglin_ricento/price');
|
| 698 |
+
|
| 699 |
+
// To trick Magento tax calculation while creating the order, add tax to Shipping price if shop is outside Switzerland
|
| 700 |
+
$pseudoProduct = new Varien_Object();
|
| 701 |
+
$pseudoProduct->setTaxClassId(Mage::helper('tax')->getShippingTaxClass($store));
|
| 702 |
+
$shippingFee = $helperPrice->getPriceWithOrWithoutTax($pseudoProduct, $shippingFee, $store, $quote);
|
| 703 |
+
|
| 704 |
+
$baseCurrencyCode = Mage::app()->getStore($store)->getBaseCurrencyCode();
|
| 705 |
|
| 706 |
if ($baseCurrencyCode != $currency->getCode()) {
|
| 707 |
+
$shippingFee = $helperPrice->convert($shippingFee, $currency->getCode(), $baseCurrencyCode);
|
| 708 |
}
|
| 709 |
|
| 710 |
return $shippingFee;
|
| 736 |
->setShippingMethod(Diglin_Ricento_Model_Sales_Method_Shipping::SHIPPING_CODE . '_' . $shippingTransactionMethod)
|
| 737 |
->collectShippingRates();
|
| 738 |
|
| 739 |
+
$quote->getPayment()->importData(
|
| 740 |
+
array(
|
| 741 |
+
'method' => Diglin_Ricento_Model_Sales_Method_Payment::PAYMENT_CODE,
|
| 742 |
+
'additional_data' => Mage::helper('core')->jsonEncode(array(
|
| 743 |
+
'is_ricardo' => true,
|
| 744 |
+
'ricardo_payment_methods' => $paymentMethods,
|
| 745 |
+
'ricardo_transaction_ids' => implode(',', $dispatchedTransactions),
|
| 746 |
+
'ricardo_bid_ids' => implode(',', array_keys($dispatchedTransactions)),
|
|
|
|
|
|
|
|
|
|
| 747 |
)
|
| 748 |
)
|
| 749 |
+
)
|
| 750 |
+
);
|
| 751 |
|
| 752 |
$quote
|
| 753 |
->addData(
|
app/code/community/Diglin/Ricento/Model/Dispatcher/Stop.php
CHANGED
|
@@ -39,7 +39,7 @@ class Diglin_Ricento_Model_Dispatcher_Stop extends Diglin_Ricento_Model_Dispatch
|
|
| 39 |
/**
|
| 40 |
* Status of the collection must be the same as Diglin_Ricento_Model_Resource_Products_Listing_Item::countListedItems
|
| 41 |
*/
|
| 42 |
-
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED), $jobListing->getLastItemId());
|
| 43 |
|
| 44 |
if ($itemCollection->count() == 0) {
|
| 45 |
$job->setJobMessage(array($this->_getNoItemMessage()));
|
|
@@ -47,6 +47,11 @@ class Diglin_Ricento_Model_Dispatcher_Stop extends Diglin_Ricento_Model_Dispatch
|
|
| 47 |
return $this;
|
| 48 |
}
|
| 49 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
$sell = Mage::getSingleton('diglin_ricento/api_services_sell');
|
| 51 |
$sell->setCurrentWebsite($this->_getListing()->getWebsiteId());
|
| 52 |
|
| 39 |
/**
|
| 40 |
* Status of the collection must be the same as Diglin_Ricento_Model_Resource_Products_Listing_Item::countListedItems
|
| 41 |
*/
|
| 42 |
+
$itemCollection = $this->_getItemCollection(array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD), $jobListing->getLastItemId());
|
| 43 |
|
| 44 |
if ($itemCollection->count() == 0) {
|
| 45 |
$job->setJobMessage(array($this->_getNoItemMessage()));
|
| 47 |
return $this;
|
| 48 |
}
|
| 49 |
|
| 50 |
+
// Get new orders before to stop - @todo sync and get order only from the current list
|
| 51 |
+
$dispatcher = Mage::getSingleton('diglin_ricento/dispatcher');
|
| 52 |
+
$dispatcher->dispatch(Diglin_Ricento_Model_Sync_Job::TYPE_SYNCLIST)->proceed();
|
| 53 |
+
$dispatcher->dispatch(Diglin_Ricento_Model_Sync_Job::TYPE_ORDER)->proceed();
|
| 54 |
+
|
| 55 |
$sell = Mage::getSingleton('diglin_ricento/api_services_sell');
|
| 56 |
$sell->setCurrentWebsite($this->_getListing()->getWebsiteId());
|
| 57 |
|
app/code/community/Diglin/Ricento/Model/Entity/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Model/Feed.php
ADDED
|
@@ -0,0 +1,74 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ricardo.ch AG - Switzerland
|
| 4 |
+
*
|
| 5 |
+
* @author Sylvain Rayé <support at diglin.com>
|
| 6 |
+
* @category Diglin
|
| 7 |
+
* @package Diglin_Ricento
|
| 8 |
+
* @copyright Copyright (c) 2015 ricardo.ch AG (http://www.ricardo.ch)
|
| 9 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 10 |
+
*/
|
| 11 |
+
|
| 12 |
+
/**
|
| 13 |
+
* Class Diglin_Ricento_Model_Feed
|
| 14 |
+
*/
|
| 15 |
+
class Diglin_Ricento_Model_Feed extends Mage_AdminNotification_Model_Feed
|
| 16 |
+
{
|
| 17 |
+
const XML_USE_HTTPS_PATH = 'ricento/adminnotification/use_https';
|
| 18 |
+
const XML_FEED_URL_PATH = 'ricento/adminnotification/feed_url';
|
| 19 |
+
const XML_FREQUENCY_PATH = 'ricento/adminnotification/frequency';
|
| 20 |
+
|
| 21 |
+
public function check()
|
| 22 |
+
{
|
| 23 |
+
if (Mage::helper('diglin_ricento')->canNotifyUpdate()) {
|
| 24 |
+
$this->checkUpdate();
|
| 25 |
+
}
|
| 26 |
+
return $this;
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
/**
|
| 30 |
+
* Retrieve feed url
|
| 31 |
+
*
|
| 32 |
+
* @return string
|
| 33 |
+
*/
|
| 34 |
+
public function getFeedUrl()
|
| 35 |
+
{
|
| 36 |
+
if (is_null($this->_feedUrl)) {
|
| 37 |
+
$this->_feedUrl = (Mage::getStoreConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://')
|
| 38 |
+
. Mage::getStoreConfig(self::XML_FEED_URL_PATH);
|
| 39 |
+
}
|
| 40 |
+
return $this->_feedUrl;
|
| 41 |
+
}
|
| 42 |
+
|
| 43 |
+
/**
|
| 44 |
+
* Retrieve Update Frequency
|
| 45 |
+
*
|
| 46 |
+
* @return int
|
| 47 |
+
*/
|
| 48 |
+
public function getFrequency()
|
| 49 |
+
{
|
| 50 |
+
return Mage::getStoreConfig(self::XML_FREQUENCY_PATH) * 3600;
|
| 51 |
+
}
|
| 52 |
+
|
| 53 |
+
/**
|
| 54 |
+
* Retrieve Last update time
|
| 55 |
+
*
|
| 56 |
+
* @return int
|
| 57 |
+
*/
|
| 58 |
+
public function getLastUpdate()
|
| 59 |
+
{
|
| 60 |
+
return Mage::app()->loadCache('ricento_notifications_lastcheck');
|
| 61 |
+
}
|
| 62 |
+
|
| 63 |
+
/**
|
| 64 |
+
* Set last update time (now)
|
| 65 |
+
*
|
| 66 |
+
* @return Mage_AdminNotification_Model_Feed
|
| 67 |
+
*/
|
| 68 |
+
public function setLastUpdate()
|
| 69 |
+
{
|
| 70 |
+
Mage::app()->saveCache(time(), 'ricento_notifications_lastcheck');
|
| 71 |
+
return $this;
|
| 72 |
+
}
|
| 73 |
+
|
| 74 |
+
}
|
app/code/community/Diglin/Ricento/Model/Products/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Model/Products/Listing/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Model/Products/Listing/Item.php
CHANGED
|
@@ -120,7 +120,7 @@ class Diglin_Ricento_Model_Products_Listing_Item extends Mage_Core_Model_Abstrac
|
|
| 120 |
parent::_beforeSave();
|
| 121 |
|
| 122 |
if ($this->hasDataChanges() && !$this->dataHasChangedFor('status')
|
| 123 |
-
&& $this->getStatus()
|
| 124 |
) {
|
| 125 |
$this->setStatus(Diglin_Ricento_Helper_Data::STATUS_PENDING);
|
| 126 |
}
|
|
@@ -161,18 +161,11 @@ class Diglin_Ricento_Model_Products_Listing_Item extends Mage_Core_Model_Abstrac
|
|
| 161 |
}
|
| 162 |
|
| 163 |
// Warm picture cache to prevent memory consumption while listing items
|
| 164 |
-
$imageHelper = Mage::helper('diglin_ricento/image');
|
| 165 |
$images = (array) $this->getProduct()->getImages($this->getBaseProductId());
|
| 166 |
-
foreach ($images as $image) {
|
| 167 |
|
|
|
|
| 168 |
if (isset($image['filepath'])) {
|
| 169 |
-
$
|
| 170 |
-
->init(new Mage_Catalog_Model_Product(), 'image', $image['filepath'])
|
| 171 |
-
->keepAspectRatio(true)
|
| 172 |
-
->keepFrame(false)
|
| 173 |
-
->setQuality(90)
|
| 174 |
-
->resize(600)
|
| 175 |
-
->__toString();
|
| 176 |
}
|
| 177 |
}
|
| 178 |
|
|
@@ -568,29 +561,25 @@ class Diglin_Ricento_Model_Products_Listing_Item extends Mage_Core_Model_Abstrac
|
|
| 568 |
|
| 569 |
foreach ($images as $image) {
|
| 570 |
|
| 571 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 572 |
continue;
|
| 573 |
}
|
| 574 |
|
| 575 |
-
if ($i >= 10) {
|
| 576 |
break;
|
| 577 |
-
};
|
| 578 |
|
| 579 |
$hashImage = md5($image['filepath']);
|
| 580 |
-
if (
|
| 581 |
-
|
| 582 |
-
$imageHelper = Mage::helper('diglin_ricento/image');
|
| 583 |
-
$imageHelper
|
| 584 |
-
->init(new Mage_Catalog_Model_Product(), 'image', $image['filepath'])
|
| 585 |
-
->keepAspectRatio(true)
|
| 586 |
-
->keepFrame(false)
|
| 587 |
-
->setQuality(90)
|
| 588 |
-
->resize(600);
|
| 589 |
-
|
| 590 |
-
$filename = $imageHelper->__toString();
|
| 591 |
|
| 592 |
// Prepare picture to set the content as byte array for the webservice
|
| 593 |
$imageExtension = Helper::getPictureExtension($filename);
|
|
|
|
| 594 |
if ($imageExtension) {
|
| 595 |
$picture = new ArticlePictureParameter();
|
| 596 |
$picture
|
| 120 |
parent::_beforeSave();
|
| 121 |
|
| 122 |
if ($this->hasDataChanges() && !$this->dataHasChangedFor('status')
|
| 123 |
+
&& !in_array($this->getStatus(), array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD))
|
| 124 |
) {
|
| 125 |
$this->setStatus(Diglin_Ricento_Helper_Data::STATUS_PENDING);
|
| 126 |
}
|
| 161 |
}
|
| 162 |
|
| 163 |
// Warm picture cache to prevent memory consumption while listing items
|
|
|
|
| 164 |
$images = (array) $this->getProduct()->getImages($this->getBaseProductId());
|
|
|
|
| 165 |
|
| 166 |
+
foreach ($images as $image) {
|
| 167 |
if (isset($image['filepath'])) {
|
| 168 |
+
Mage::helper('diglin_ricento/image')->prepareRicardoPicture($image['filepath']);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 169 |
}
|
| 170 |
}
|
| 171 |
|
| 561 |
|
| 562 |
foreach ($images as $image) {
|
| 563 |
|
| 564 |
+
$filename = false;
|
| 565 |
+
if (isset($image['filepath'])) {
|
| 566 |
+
$filename = Mage::helper('diglin_ricento/image')->prepareRicardoPicture($image['filepath']);
|
| 567 |
+
}
|
| 568 |
+
|
| 569 |
+
if (!$filename) {
|
| 570 |
continue;
|
| 571 |
}
|
| 572 |
|
| 573 |
+
if ($i >= 10) { // Do not set more than 10 pictures
|
| 574 |
break;
|
| 575 |
+
};
|
| 576 |
|
| 577 |
$hashImage = md5($image['filepath']);
|
| 578 |
+
if (!isset($hash[$hashImage])) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 579 |
|
| 580 |
// Prepare picture to set the content as byte array for the webservice
|
| 581 |
$imageExtension = Helper::getPictureExtension($filename);
|
| 582 |
+
|
| 583 |
if ($imageExtension) {
|
| 584 |
$picture = new ArticlePictureParameter();
|
| 585 |
$picture
|
app/code/community/Diglin/Ricento/Model/Resource/Products/Listing.php
CHANGED
|
@@ -75,7 +75,7 @@ class Diglin_Ricento_Model_Resource_Products_Listing extends Mage_Core_Model_Res
|
|
| 75 |
if ($row['item_status'] == Diglin_Ricento_Helper_Data::STATUS_STOPPED) {
|
| 76 |
$lists[$row['entity_id']]['stopped'] = true;
|
| 77 |
}
|
| 78 |
-
if ($row['item_status'] == Diglin_Ricento_Helper_Data::STATUS_LISTED) {
|
| 79 |
$lists[$row['entity_id']]['listed'] = true;
|
| 80 |
}
|
| 81 |
}
|
|
@@ -123,11 +123,11 @@ class Diglin_Ricento_Model_Resource_Products_Listing extends Mage_Core_Model_Res
|
|
| 123 |
$itemsToRemove = clone $items;
|
| 124 |
|
| 125 |
$numberOfListedItems = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 126 |
-
->addFieldToFilter('status', array('
|
| 127 |
->getSize();
|
| 128 |
|
| 129 |
$numberOfItemsToDelete = $itemsToRemove->addFieldToFilter('products_listing_id', $itemId)
|
| 130 |
-
->addFieldToFilter('status', array('
|
| 131 |
->count();
|
| 132 |
|
| 133 |
$this->beginTransaction();
|
|
@@ -151,10 +151,9 @@ class Diglin_Ricento_Model_Resource_Products_Listing extends Mage_Core_Model_Res
|
|
| 151 |
|
| 152 |
$childrenCount = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 153 |
->addFieldToFilter('parent_product_id', $productId)
|
| 154 |
-
->addFieldToFilter('status', array('
|
| 155 |
->getSize();
|
| 156 |
|
| 157 |
-
|
| 158 |
if (!$childrenCount) {
|
| 159 |
$this->beginTransaction();
|
| 160 |
|
|
@@ -202,11 +201,11 @@ class Diglin_Ricento_Model_Resource_Products_Listing extends Mage_Core_Model_Res
|
|
| 202 |
$itemsToRemove = clone $items;
|
| 203 |
|
| 204 |
$numberOfListedItems = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 205 |
-
->addFieldToFilter('status', array('
|
| 206 |
->getSize();
|
| 207 |
|
| 208 |
$numberOfItemsToDelete = $itemsToRemove->addFieldToFilter('products_listing_id', $itemId)
|
| 209 |
-
->addFieldToFilter('status', array('
|
| 210 |
->count();
|
| 211 |
|
| 212 |
$this->beginTransaction();
|
|
@@ -230,7 +229,7 @@ class Diglin_Ricento_Model_Resource_Products_Listing extends Mage_Core_Model_Res
|
|
| 230 |
|
| 231 |
$childrenCount = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 232 |
->addFieldToFilter('parent_item_id', $itemId)
|
| 233 |
-
->addFieldToFilter('status', array('
|
| 234 |
->getSize();
|
| 235 |
|
| 236 |
if (!$childrenCount) {
|
| 75 |
if ($row['item_status'] == Diglin_Ricento_Helper_Data::STATUS_STOPPED) {
|
| 76 |
$lists[$row['entity_id']]['stopped'] = true;
|
| 77 |
}
|
| 78 |
+
if ($row['item_status'] == Diglin_Ricento_Helper_Data::STATUS_LISTED || $row['item_status'] == Diglin_Ricento_Helper_Data::STATUS_SOLD) {
|
| 79 |
$lists[$row['entity_id']]['listed'] = true;
|
| 80 |
}
|
| 81 |
}
|
| 123 |
$itemsToRemove = clone $items;
|
| 124 |
|
| 125 |
$numberOfListedItems = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 126 |
+
->addFieldToFilter('status', array('in' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 127 |
->getSize();
|
| 128 |
|
| 129 |
$numberOfItemsToDelete = $itemsToRemove->addFieldToFilter('products_listing_id', $itemId)
|
| 130 |
+
->addFieldToFilter('status', array('nin' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 131 |
->count();
|
| 132 |
|
| 133 |
$this->beginTransaction();
|
| 151 |
|
| 152 |
$childrenCount = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 153 |
->addFieldToFilter('parent_product_id', $productId)
|
| 154 |
+
->addFieldToFilter('status', array('in' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 155 |
->getSize();
|
| 156 |
|
|
|
|
| 157 |
if (!$childrenCount) {
|
| 158 |
$this->beginTransaction();
|
| 159 |
|
| 201 |
$itemsToRemove = clone $items;
|
| 202 |
|
| 203 |
$numberOfListedItems = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 204 |
+
->addFieldToFilter('status', array('in' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 205 |
->getSize();
|
| 206 |
|
| 207 |
$numberOfItemsToDelete = $itemsToRemove->addFieldToFilter('products_listing_id', $itemId)
|
| 208 |
+
->addFieldToFilter('status', array('nin' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 209 |
->count();
|
| 210 |
|
| 211 |
$this->beginTransaction();
|
| 229 |
|
| 230 |
$childrenCount = $items->addFieldToFilter('products_listing_id', $itemId)
|
| 231 |
->addFieldToFilter('parent_item_id', $itemId)
|
| 232 |
+
->addFieldToFilter('status', array('in' => array(Diglin_Ricento_Helper_Data::STATUS_LISTED, Diglin_Ricento_Helper_Data::STATUS_SOLD)))
|
| 233 |
->getSize();
|
| 234 |
|
| 235 |
if (!$childrenCount) {
|
app/code/community/Diglin/Ricento/Model/Sales/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/Test/Model/Feed.php
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* ricardo.ch AG - Switzerland
|
| 4 |
+
*
|
| 5 |
+
* @author Sylvain Rayé <support at diglin.com>
|
| 6 |
+
* @category Diglin
|
| 7 |
+
* @package Diglin_Ricento
|
| 8 |
+
* @copyright Copyright (c) 2015 ricardo.ch AG (http://www.ricardo.ch)
|
| 9 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 10 |
+
*/
|
| 11 |
+
|
| 12 |
+
/**
|
| 13 |
+
* Class Diglin_Ricento_Test_Model_Feed
|
| 14 |
+
*/
|
| 15 |
+
class Diglin_Ricento_Test_Model_Feed extends EcomDev_PHPUnit_Test_Case
|
| 16 |
+
{
|
| 17 |
+
/**
|
| 18 |
+
* @var Diglin_Ricento_Model_Feed
|
| 19 |
+
*/
|
| 20 |
+
protected $_feed;
|
| 21 |
+
|
| 22 |
+
protected function setUp()
|
| 23 |
+
{
|
| 24 |
+
$this->_feed = Mage::getModel('diglin_ricento/feed');
|
| 25 |
+
parent::setUp();
|
| 26 |
+
}
|
| 27 |
+
|
| 28 |
+
/**
|
| 29 |
+
* @test
|
| 30 |
+
* loadExpectations
|
| 31 |
+
* dataProvider dataProvider
|
| 32 |
+
*/
|
| 33 |
+
public function testFeedData()
|
| 34 |
+
{
|
| 35 |
+
// var_dump($this->_feed->getFeedData());
|
| 36 |
+
}
|
| 37 |
+
}
|
app/code/community/Diglin/Ricento/controllers/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/CategoryController.php
CHANGED
|
@@ -90,11 +90,8 @@ class Diglin_Ricento_Adminhtml_Products_CategoryController extends Diglin_Ricent
|
|
| 90 |
->setCategoryId($categoryId)
|
| 91 |
->setSuggestedCategoriesId($suggestedCategoriesId);
|
| 92 |
|
| 93 |
-
// array_shift($categories);
|
| 94 |
-
|
| 95 |
$response
|
| 96 |
->setCategoryId($categoryId)
|
| 97 |
-
// ->setOtherSuggestions($categories)
|
| 98 |
->setContent($block->toHtml())
|
| 99 |
->setLevels($block->getLevels()) // must be after $block->toHtml()
|
| 100 |
->setChildrenUrl($this->getUrl('ricento/products_category/children', array('id' => '#ID#', 'level' => '#LVL#')));
|
| 90 |
->setCategoryId($categoryId)
|
| 91 |
->setSuggestedCategoriesId($suggestedCategoriesId);
|
| 92 |
|
|
|
|
|
|
|
| 93 |
$response
|
| 94 |
->setCategoryId($categoryId)
|
|
|
|
| 95 |
->setContent($block->toHtml())
|
| 96 |
->setLevels($block->getLevels()) // must be after $block->toHtml()
|
| 97 |
->setChildrenUrl($this->getUrl('ricento/products_category/children', array('id' => '#ID#', 'level' => '#LVL#')));
|
app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/Listing/ItemController.php
CHANGED
|
@@ -127,7 +127,7 @@ class Diglin_Ricento_Adminhtml_Products_Listing_ItemController extends Diglin_Ri
|
|
| 127 |
{
|
| 128 |
foreach ($this->getSelectedItems() as $item) {
|
| 129 |
/* @var $item Diglin_Ricento_Model_Products_Listing_Item */
|
| 130 |
-
if ($item->getStatus() === Diglin_Ricento_Helper_Data::STATUS_LISTED) {
|
| 131 |
return false;
|
| 132 |
}
|
| 133 |
}
|
| 127 |
{
|
| 128 |
foreach ($this->getSelectedItems() as $item) {
|
| 129 |
/* @var $item Diglin_Ricento_Model_Products_Listing_Item */
|
| 130 |
+
if ($item->getStatus() === Diglin_Ricento_Helper_Data::STATUS_LISTED || $item->getStatus() === Diglin_Ricento_Helper_Data::STATUS_SOLD) {
|
| 131 |
return false;
|
| 132 |
}
|
| 133 |
}
|
app/code/community/Diglin/Ricento/controllers/Adminhtml/Products/ListingController.php
CHANGED
|
@@ -497,9 +497,10 @@ class Diglin_Ricento_Adminhtml_Products_ListingController extends Diglin_Ricento
|
|
| 497 |
return;
|
| 498 |
}
|
| 499 |
|
| 500 |
-
$
|
|
|
|
| 501 |
|
| 502 |
-
if ($
|
| 503 |
$listing
|
| 504 |
->setStatus(Diglin_Ricento_Helper_Data::STATUS_STOPPED)
|
| 505 |
->save();
|
|
@@ -509,14 +510,14 @@ class Diglin_Ricento_Adminhtml_Products_ListingController extends Diglin_Ricento
|
|
| 509 |
return;
|
| 510 |
}
|
| 511 |
|
| 512 |
-
if ($
|
| 513 |
$this->_getSession()->addError($this->__('Only listed product items can be stopped.'));
|
| 514 |
$this->_redirectUrl($this->_getRefererUrl());
|
| 515 |
return;
|
| 516 |
}
|
| 517 |
|
| 518 |
$this->_successMessage = $this->__('The job to stop to list your products will start in few minutes.') . ' ' . $this->__('You can check the progression below.');
|
| 519 |
-
$this->_startJobList(Diglin_Ricento_Model_Sync_Job::TYPE_STOP, $
|
| 520 |
}
|
| 521 |
|
| 522 |
/**
|
|
@@ -566,11 +567,12 @@ class Diglin_Ricento_Adminhtml_Products_ListingController extends Diglin_Ricento
|
|
| 566 |
}
|
| 567 |
|
| 568 |
try {
|
|
|
|
| 569 |
if ($listing->getStatus() != Diglin_Ricento_Helper_Data::STATUS_LISTED && !$this->saveAction()) {
|
| 570 |
$error = true;
|
| 571 |
}
|
| 572 |
|
| 573 |
-
$this->getResponse()->clearHeader('Location'); // reset the header came from the saveAction
|
| 574 |
|
| 575 |
if (!$error) {
|
| 576 |
$articleDetails = array();
|
|
@@ -605,7 +607,7 @@ class Diglin_Ricento_Adminhtml_Products_ListingController extends Diglin_Ricento
|
|
| 605 |
|
| 606 |
$this->_initLayoutMessages('adminhtml/session');
|
| 607 |
$block = $this->getLayout()->createBlock('diglin_ricento/adminhtml_products_listing_confirmation', 'fees_confirmation', array('article_fees' => $fees));
|
| 608 |
-
|
| 609 |
return;
|
| 610 |
} else {
|
| 611 |
$this->_getSession()->addError($this->__('Sorry, no product found for fees calculation.'));
|
| 497 |
return;
|
| 498 |
}
|
| 499 |
|
| 500 |
+
$countListedItems = Mage::getResourceModel('diglin_ricento/products_listing_item')->countListedItems($this->_getListing()->getId());
|
| 501 |
+
$countSoldItems = Mage::getResourceModel('diglin_ricento/products_listing_item')->countSoldItems($this->_getListing()->getId());
|
| 502 |
|
| 503 |
+
if (($countListedItems + $countSoldItems) == 0 && $listing->getStatus() == Diglin_Ricento_Helper_Data::STATUS_LISTED) {
|
| 504 |
$listing
|
| 505 |
->setStatus(Diglin_Ricento_Helper_Data::STATUS_STOPPED)
|
| 506 |
->save();
|
| 510 |
return;
|
| 511 |
}
|
| 512 |
|
| 513 |
+
if (($countListedItems + $countSoldItems) == 0) {
|
| 514 |
$this->_getSession()->addError($this->__('Only listed product items can be stopped.'));
|
| 515 |
$this->_redirectUrl($this->_getRefererUrl());
|
| 516 |
return;
|
| 517 |
}
|
| 518 |
|
| 519 |
$this->_successMessage = $this->__('The job to stop to list your products will start in few minutes.') . ' ' . $this->__('You can check the progression below.');
|
| 520 |
+
$this->_startJobList(Diglin_Ricento_Model_Sync_Job::TYPE_STOP, ($countListedItems + $countSoldItems) );
|
| 521 |
}
|
| 522 |
|
| 523 |
/**
|
| 567 |
}
|
| 568 |
|
| 569 |
try {
|
| 570 |
+
|
| 571 |
if ($listing->getStatus() != Diglin_Ricento_Helper_Data::STATUS_LISTED && !$this->saveAction()) {
|
| 572 |
$error = true;
|
| 573 |
}
|
| 574 |
|
| 575 |
+
$this->getResponse()->clearHeader('Location')->setHttpResponseCode(200); // reset the header came from the saveAction
|
| 576 |
|
| 577 |
if (!$error) {
|
| 578 |
$articleDetails = array();
|
| 607 |
|
| 608 |
$this->_initLayoutMessages('adminhtml/session');
|
| 609 |
$block = $this->getLayout()->createBlock('diglin_ricento/adminhtml_products_listing_confirmation', 'fees_confirmation', array('article_fees' => $fees));
|
| 610 |
+
$this->getResponse()->setBody($block->toHtml());
|
| 611 |
return;
|
| 612 |
} else {
|
| 613 |
$this->_getSession()->addError($this->__('Sorry, no product found for fees calculation.'));
|
app/code/community/Diglin/Ricento/data/.DS_Store
DELETED
|
Binary file
|
app/code/community/Diglin/Ricento/etc/adminhtml.xml
CHANGED
|
@@ -87,14 +87,14 @@
|
|
| 87 |
<config>
|
| 88 |
<children>
|
| 89 |
<ricento translate="title" module="diglin_ricento">
|
| 90 |
-
<title>
|
| 91 |
</ricento>
|
| 92 |
</children>
|
| 93 |
</config>
|
| 94 |
</children>
|
| 95 |
</system>
|
| 96 |
<ricento translate="title" module="diglin_ricento">
|
| 97 |
-
<title>
|
| 98 |
<children>
|
| 99 |
<dashboard translate="title" module="diglin_ricento">
|
| 100 |
<title>Dashboard</title>
|
|
@@ -113,6 +113,14 @@
|
|
| 113 |
</config>
|
| 114 |
<support translate="title" module="diglin_ricento">
|
| 115 |
<title>Support</title>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 116 |
</support>
|
| 117 |
</children>
|
| 118 |
</ricento>
|
| 87 |
<config>
|
| 88 |
<children>
|
| 89 |
<ricento translate="title" module="diglin_ricento">
|
| 90 |
+
<title>ricardo.ch Extension by Diglin GmbH</title>
|
| 91 |
</ricento>
|
| 92 |
</children>
|
| 93 |
</config>
|
| 94 |
</children>
|
| 95 |
</system>
|
| 96 |
<ricento translate="title" module="diglin_ricento">
|
| 97 |
+
<title>ricardo.ch Extension by Diglin GmbH</title>
|
| 98 |
<children>
|
| 99 |
<dashboard translate="title" module="diglin_ricento">
|
| 100 |
<title>Dashboard</title>
|
| 113 |
</config>
|
| 114 |
<support translate="title" module="diglin_ricento">
|
| 115 |
<title>Support</title>
|
| 116 |
+
<children>
|
| 117 |
+
<contact translate="title" module="diglin_ricento">
|
| 118 |
+
<title>Contact</title>
|
| 119 |
+
</contact>
|
| 120 |
+
<export translate="title" module="diglin_ricento">
|
| 121 |
+
<title>Export Configuration for support (no customer data are sent)</title>
|
| 122 |
+
</export>
|
| 123 |
+
</children>
|
| 124 |
</support>
|
| 125 |
</children>
|
| 126 |
</ricento>
|
app/code/community/Diglin/Ricento/etc/config.xml
CHANGED
|
@@ -13,7 +13,7 @@
|
|
| 13 |
<config>
|
| 14 |
<modules>
|
| 15 |
<Diglin_Ricento>
|
| 16 |
-
<version>1.1.
|
| 17 |
</Diglin_Ricento>
|
| 18 |
</modules>
|
| 19 |
|
|
@@ -31,9 +31,17 @@
|
|
| 31 |
</system>
|
| 32 |
|
| 33 |
<ricento>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
<listing>
|
| 35 |
<merge_descriptions>0</merge_descriptions>
|
| 36 |
<nl2br>0</nl2br>
|
|
|
|
|
|
|
|
|
|
| 37 |
</listing>
|
| 38 |
<global>
|
| 39 |
<merge_order>1</merge_order>
|
|
@@ -49,6 +57,7 @@
|
|
| 49 |
<stats_test_mode>0</stats_test_mode>
|
| 50 |
<stats_app_id>bza2zlst</stats_app_id>
|
| 51 |
<stats_app_id_test>xce86uyp</stats_app_id_test>
|
|
|
|
| 52 |
</global>
|
| 53 |
<api_config>
|
| 54 |
<enabled>1</enabled>
|
|
@@ -356,6 +365,16 @@
|
|
| 356 |
</ricardo_customer_fields>
|
| 357 |
</observers>
|
| 358 |
</adminhtml_block_html_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 359 |
</events>
|
| 360 |
</adminhtml>
|
| 361 |
|
| 13 |
<config>
|
| 14 |
<modules>
|
| 15 |
<Diglin_Ricento>
|
| 16 |
+
<version>1.1.3</version>
|
| 17 |
</Diglin_Ricento>
|
| 18 |
</modules>
|
| 19 |
|
| 31 |
</system>
|
| 32 |
|
| 33 |
<ricento>
|
| 34 |
+
<adminnotification>
|
| 35 |
+
<feed_url>notifications.diglin.com/externals/magento.rss</feed_url>
|
| 36 |
+
<use_https>0</use_https>
|
| 37 |
+
<frequency>1</frequency>
|
| 38 |
+
</adminnotification>
|
| 39 |
<listing>
|
| 40 |
<merge_descriptions>0</merge_descriptions>
|
| 41 |
<nl2br>0</nl2br>
|
| 42 |
+
<watermark_enabled>0</watermark_enabled>
|
| 43 |
+
<watermark_imageOpacity>100</watermark_imageOpacity>
|
| 44 |
+
<placeholder_allowed>0</placeholder_allowed>
|
| 45 |
</listing>
|
| 46 |
<global>
|
| 47 |
<merge_order>1</merge_order>
|
| 57 |
<stats_test_mode>0</stats_test_mode>
|
| 58 |
<stats_app_id>bza2zlst</stats_app_id>
|
| 59 |
<stats_app_id_test>xce86uyp</stats_app_id_test>
|
| 60 |
+
<update_notification>1</update_notification>
|
| 61 |
</global>
|
| 62 |
<api_config>
|
| 63 |
<enabled>1</enabled>
|
| 365 |
</ricardo_customer_fields>
|
| 366 |
</observers>
|
| 367 |
</adminhtml_block_html_before>
|
| 368 |
+
|
| 369 |
+
<controller_action_predispatch>
|
| 370 |
+
<observers>
|
| 371 |
+
<ricento_news>
|
| 372 |
+
<type>singleton</type>
|
| 373 |
+
<class>Diglin_Ricento_Model_Feed</class>
|
| 374 |
+
<method>check</method>
|
| 375 |
+
</ricento_news>
|
| 376 |
+
</observers>
|
| 377 |
+
</controller_action_predispatch>
|
| 378 |
</events>
|
| 379 |
</adminhtml>
|
| 380 |
|
app/code/community/Diglin/Ricento/etc/system.xml
CHANGED
|
@@ -17,7 +17,7 @@
|
|
| 17 |
<sort_order>400</sort_order>
|
| 18 |
</diglin>
|
| 19 |
</tabs>
|
| 20 |
-
|
| 21 |
<sections>
|
| 22 |
<ricento module="diglin_ricento" translate="label">
|
| 23 |
<label><![CDATA[<img width="16" height="16" style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkY5RTRGREZEMTI3MTFFM0ExQkNBQjM2QkYxRTNDMjMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkY5RTRGRTBEMTI3MTFFM0ExQkNBQjM2QkYxRTNDMjMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCRjlFNEZEREQxMjcxMUUzQTFCQ0FCMzZCRjFFM0MyMyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCRjlFNEZERUQxMjcxMUUzQTFCQ0FCMzZCRjFFM0MyMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvtFcEUAAAc/SURBVHjapFZ5bBxXGf9m3hx7bxzfVxLXUZw0wUmaxKGYy1ElRKoEREkr6EEBtSAQCP5BqlSBiBCNlFYElUgtUHoQqhYlCqJIrWhQCVGdtmnjtolLiuM4PmJnba/X9p5zPn5vduxuvN42akf62bMz897vfd/3+w4p/7s2WubaAhwH1gAF+viXBMiABfQDvweeBBylwgITGPYXGB+TlAOu/z/oG3MY+ALwLamCxQwI+ScuHl3ieMi9B0zGfsz294VBDiPHZR6DzaXSZaXXWuBRYDvwQCXia7wVUGA0yCxb87ZMGFF6O9VEk4UoNQTmaXPVONXpWe8givjWUSnv6PjWXep2YfWrwKjyYZQeoVqgqXQdPTnURScS68hyZco6GiUKMSqAIMgsqgd5EB4IKSbtaXqP7lp1hqLhFMzXybADxPmi6wf9WN8kLA76PjP9lyTDrZqao6vZavrz8HY6PtZJl7I1ZMKdTCpaMZs299l56zY9rD0RC2sve8HEah0H6Igm6CtN52lPcz+1R6aoYOkL3o8ALwBfFMSncfM/4AdAVsIHOiw9MrSDHhv8DA3AWpsrWOfQfDq3z8pZ28JxvfC1nvbdN2+q33rizOh//n7q8r/tvB3SQmpvLBp+wUWcZdiwKT5Oj247RhurxqhgBgW3IP6HEJhw9U5AF4YKc3XZpPFsFT0+2E1nU80UgAWSayiqIt117+6OB1rqo83/fGPU/XRnQ+jbt25g07OFz41ezWz/+q617PxQ8ssv9g4rMsnHDa5T32wzPYUQPVx92ROmWyK6hRyzP1CvSxmIKGUFSIOgBLHtOGF44vav9rSv++k3toQ726ujkD0LaIxkWVK3dNTEfrjvU+E93W2bTcvdw7lLEdVAyIhenFhP7063kapdWw7kchFzL8aK5C6qErETnolGQypEo5IgdJyiYhyXU1BXKBxUKRbRKG9YPclE+jdTqfx9MsIzacYgzJ3Ytuj+hUtZwoknFp2aaofFodJsFG8cQVL8wRffCU1wX7Y5w6INbdWrb+tp//F0Kj9+9JVLLGvyP52cajcnsiupIThHBjKhzGINpOl8jJ4b3UppKFFnsFryKNzSqpDOmiApRieTs2g+Y3n3tu1SR2tc+tndN8n33Lq+hUn0Xdt2giLt5hA6SapgsYy4HLvcRefmm8iFFXOZwiZYZzBZTuIApm8Y3dASp6aakHe/uiFKSCfvPm84HkQooiFNuEmomIkUXEjDMmJVtmkaan5maDvlLJmCCt+2pnXFfhC77w/PPW1Zjua6xcXf/NI6CmrFpXs/3wbxFZ+HoYHGuvBiCAC2ECe+pIwuEjOod2CmngZRKAzDbm2pCvz8F/ft2L0iotMvnziz6q0LicZsoejeNY2xxQ1a6iKL9zdvbKD25rgQA12eSMNpfBSesmzOyOW0PLE4Uw7NyuGyWBhXFHnb1o5ajwSi6nzo6bc+sh011YY9XBhO0aHn+oZzpntQU1muGaKqC2S8vcvSibsK3RCeoWo9RwFdHZlI5n/18JGzwyOJDN3S1Ur7799JnWurr6sfXk3m6F9nxhKmxV9SmOR0RCZpJcitki68SCwetsUStBc1Nqrz+YzhPvaHv713YP8f35hOzOSoe3PjNS7+sAtipJWxgAw3B11XKqpZdpcvIF45g/L2Np1DtTIoFNCFHJ89+srFkffhuuu9xiYz9NcTAwmE6xnGZAsGU62GlokCIlWqXNxWqSU0RzE0iWJFUoV6j710emQGlei6iM9emKLDR9/tt11+WFGYHUNbvaUePcgtrVtLiG302cZQij5bcwkvkHuqOp837F//9vl3Djzyl77UR5EnENvecxOTsZD2siyh8IJJiGpT/Co0pFau1bZwhuzQd9pep6ZgGnGXvBqsKvLBQ8+/c/DgkbPJmbnKs9/Jviv0yLN9pyCoA4wpXIabb0RvXoHpxHZYZWIJzrCNMG2tHaKu6mES+Ze3GUUCCimy9NDjx/t7T749XpFYYTLpqhL0moe/46rQrDfFWB9EWC0rmZ668YECN/fUDlLvVBtdKcSpINwkOWoowK4gvwdKGsc15xZ1ncnSiI18dZElmmwVRYv4SgsaJroI1Cjlox0nC1bfueZNakTuiVnrNPrpGFdsm6sPShI74BtURuxKTLIcllMkGZ0oTd3Vl6inboC4oy0QC5H8REywij8I6KXdx/FGVqJdzedpV+N/6WRiPR3q38EHCquTipFMUi5Qziq6m5n0CLtqxulHG05Td91F73g5tFhf0+KPyM2UmLlew81moBvoK7VEFHYFAlH1POp3gMbzVRSLRSkeEYNAqY/JmzZmszbNz81Ta3iWVHQ6ywx5c/ZyU7Ygvt8ftN8EvgeMLHWj+KGiuChiDDJtqJ0vu5mKBswwjdioB8XB3ltaKB2tSomFsp8C7vBjd8GPhUSf7BLhmwEeBF4vywBfaff6L78PbPTTjH9CYpE2E8DK5V7+X4ABANuaCb3j3gT7AAAAAElFTkSuQmCC"/> ricardo.ch]]></label>
|
|
@@ -36,43 +36,23 @@
|
|
| 36 |
<show_in_store>1</show_in_store>
|
| 37 |
</hint>
|
| 38 |
|
| 39 |
-
<
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
<fields>
|
| 46 |
-
<
|
| 47 |
-
<label>
|
| 48 |
-
<frontend_type>select</frontend_type>
|
| 49 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 50 |
-
<comment><![CDATA[Merge short and normal descriptions as one content for ricardo product description. The short description will be the first part and the normal description will be the second part of the ricardo article description.]]></comment>
|
| 51 |
-
<sort_order>10</sort_order>
|
| 52 |
-
<show_in_default>1</show_in_default>
|
| 53 |
-
<show_in_website>0</show_in_website>
|
| 54 |
-
<show_in_store>0</show_in_store>
|
| 55 |
-
</merge_descriptions>
|
| 56 |
-
<nl2br>
|
| 57 |
-
<label>Replace Carriage Return with br HTML Tag</label>
|
| 58 |
<frontend_type>select</frontend_type>
|
| 59 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 60 |
-
<comment><![CDATA[
|
| 61 |
-
<sort_order>
|
| 62 |
<show_in_default>1</show_in_default>
|
| 63 |
<show_in_website>0</show_in_website>
|
| 64 |
<show_in_store>0</show_in_store>
|
| 65 |
-
</
|
| 66 |
-
</fields>
|
| 67 |
-
</listing>
|
| 68 |
-
|
| 69 |
-
<global module="diglin_ricento" translate="label comment"><!-- for legacy reason keep "global" -->
|
| 70 |
-
<label>Order Configuration</label>
|
| 71 |
-
<sort_order>10</sort_order>
|
| 72 |
-
<show_in_default>1</show_in_default>
|
| 73 |
-
<show_in_website>1</show_in_website>
|
| 74 |
-
<show_in_store>1</show_in_store>
|
| 75 |
-
<fields>
|
| 76 |
<merge_order module="diglin_ricento" translate="label comment">
|
| 77 |
<label>Merge Order</label>
|
| 78 |
<frontend_type>select</frontend_type>
|
|
@@ -85,14 +65,14 @@
|
|
| 85 |
</merge_order>
|
| 86 |
<!-- @todo Implementation to finish when ricardo.ch API is implemented -->
|
| 87 |
<!--<decrease_inventory module="diglin_ricento" translate="label comment">-->
|
| 88 |
-
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
| 96 |
<!--</decrease_inventory>-->
|
| 97 |
<shipping_calculation module="diglin_ricento" translate="label comment">
|
| 98 |
<label>Shipping Calculation</label>
|
|
@@ -106,14 +86,14 @@
|
|
| 106 |
</shipping_calculation>
|
| 107 |
<!-- not allowed at the moment -->
|
| 108 |
<!--<email_account_creation module="diglin_ricento" translate="label comment">-->
|
| 109 |
-
|
| 110 |
-
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
|
| 116 |
-
|
| 117 |
<!--</email_account_creation>-->
|
| 118 |
<email_order_creation module="diglin_ricento" translate="label comment">
|
| 119 |
<label>Send Email for new order</label>
|
|
@@ -128,6 +108,116 @@
|
|
| 128 |
</fields>
|
| 129 |
</global>
|
| 130 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 131 |
<api_config module="diglin_ricento" translate="label">
|
| 132 |
<label>API Token Configuration</label>
|
| 133 |
<sort_order>20</sort_order>
|
|
@@ -184,52 +274,52 @@
|
|
| 184 |
<show_in_store>0</show_in_store>
|
| 185 |
</email_notification>
|
| 186 |
<!--<simulate_authorization module="diglin_ricento" translate="label comment">-->
|
| 187 |
-
|
| 188 |
-
|
| 189 |
-
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
|
| 193 |
-
|
| 194 |
-
|
| 195 |
<!--</simulate_authorization>-->
|
| 196 |
<!--<ricardo_account module="diglin_ricento" translate="label">-->
|
| 197 |
-
|
| 198 |
-
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
<!--</ricardo_account>-->
|
| 207 |
<!--<ricardo_username module="diglin_ricento" translate="label comment">-->
|
| 208 |
-
|
| 209 |
-
|
| 210 |
-
|
| 211 |
-
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
|
| 215 |
-
|
| 216 |
-
|
| 217 |
-
|
| 218 |
-
|
| 219 |
<!--</ricardo_username>-->
|
| 220 |
<!--<ricardo_password module="diglin_ricento" translate="label comment">-->
|
| 221 |
-
|
| 222 |
-
|
| 223 |
-
|
| 224 |
-
|
| 225 |
-
|
| 226 |
-
|
| 227 |
-
|
| 228 |
-
|
| 229 |
-
|
| 230 |
-
|
| 231 |
-
|
| 232 |
-
|
| 233 |
<!--</ricardo_password>-->
|
| 234 |
|
| 235 |
<api_de module="diglin_ricento" translate="label comment">
|
| 17 |
<sort_order>400</sort_order>
|
| 18 |
</diglin>
|
| 19 |
</tabs>
|
| 20 |
+
|
| 21 |
<sections>
|
| 22 |
<ricento module="diglin_ricento" translate="label">
|
| 23 |
<label><![CDATA[<img width="16" height="16" style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkY5RTRGREZEMTI3MTFFM0ExQkNBQjM2QkYxRTNDMjMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkY5RTRGRTBEMTI3MTFFM0ExQkNBQjM2QkYxRTNDMjMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCRjlFNEZEREQxMjcxMUUzQTFCQ0FCMzZCRjFFM0MyMyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCRjlFNEZERUQxMjcxMUUzQTFCQ0FCMzZCRjFFM0MyMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvtFcEUAAAc/SURBVHjapFZ5bBxXGf9m3hx7bxzfVxLXUZw0wUmaxKGYy1ElRKoEREkr6EEBtSAQCP5BqlSBiBCNlFYElUgtUHoQqhYlCqJIrWhQCVGdtmnjtolLiuM4PmJnba/X9p5zPn5vduxuvN42akf62bMz897vfd/3+w4p/7s2WubaAhwH1gAF+viXBMiABfQDvweeBBylwgITGPYXGB+TlAOu/z/oG3MY+ALwLamCxQwI+ScuHl3ieMi9B0zGfsz294VBDiPHZR6DzaXSZaXXWuBRYDvwQCXia7wVUGA0yCxb87ZMGFF6O9VEk4UoNQTmaXPVONXpWe8givjWUSnv6PjWXep2YfWrwKjyYZQeoVqgqXQdPTnURScS68hyZco6GiUKMSqAIMgsqgd5EB4IKSbtaXqP7lp1hqLhFMzXybADxPmi6wf9WN8kLA76PjP9lyTDrZqao6vZavrz8HY6PtZJl7I1ZMKdTCpaMZs299l56zY9rD0RC2sve8HEah0H6Igm6CtN52lPcz+1R6aoYOkL3o8ALwBfFMSncfM/4AdAVsIHOiw9MrSDHhv8DA3AWpsrWOfQfDq3z8pZ28JxvfC1nvbdN2+q33rizOh//n7q8r/tvB3SQmpvLBp+wUWcZdiwKT5Oj247RhurxqhgBgW3IP6HEJhw9U5AF4YKc3XZpPFsFT0+2E1nU80UgAWSayiqIt117+6OB1rqo83/fGPU/XRnQ+jbt25g07OFz41ezWz/+q617PxQ8ssv9g4rMsnHDa5T32wzPYUQPVx92ROmWyK6hRyzP1CvSxmIKGUFSIOgBLHtOGF44vav9rSv++k3toQ726ujkD0LaIxkWVK3dNTEfrjvU+E93W2bTcvdw7lLEdVAyIhenFhP7063kapdWw7kchFzL8aK5C6qErETnolGQypEo5IgdJyiYhyXU1BXKBxUKRbRKG9YPclE+jdTqfx9MsIzacYgzJ3Ytuj+hUtZwoknFp2aaofFodJsFG8cQVL8wRffCU1wX7Y5w6INbdWrb+tp//F0Kj9+9JVLLGvyP52cajcnsiupIThHBjKhzGINpOl8jJ4b3UppKFFnsFryKNzSqpDOmiApRieTs2g+Y3n3tu1SR2tc+tndN8n33Lq+hUn0Xdt2giLt5hA6SapgsYy4HLvcRefmm8iFFXOZwiZYZzBZTuIApm8Y3dASp6aakHe/uiFKSCfvPm84HkQooiFNuEmomIkUXEjDMmJVtmkaan5maDvlLJmCCt+2pnXFfhC77w/PPW1Zjua6xcXf/NI6CmrFpXs/3wbxFZ+HoYHGuvBiCAC2ECe+pIwuEjOod2CmngZRKAzDbm2pCvz8F/ft2L0iotMvnziz6q0LicZsoejeNY2xxQ1a6iKL9zdvbKD25rgQA12eSMNpfBSesmzOyOW0PLE4Uw7NyuGyWBhXFHnb1o5ajwSi6nzo6bc+sh011YY9XBhO0aHn+oZzpntQU1muGaKqC2S8vcvSibsK3RCeoWo9RwFdHZlI5n/18JGzwyOJDN3S1Ur7799JnWurr6sfXk3m6F9nxhKmxV9SmOR0RCZpJcitki68SCwetsUStBc1Nqrz+YzhPvaHv713YP8f35hOzOSoe3PjNS7+sAtipJWxgAw3B11XKqpZdpcvIF45g/L2Np1DtTIoFNCFHJ89+srFkffhuuu9xiYz9NcTAwmE6xnGZAsGU62GlokCIlWqXNxWqSU0RzE0iWJFUoV6j710emQGlei6iM9emKLDR9/tt11+WFGYHUNbvaUePcgtrVtLiG302cZQij5bcwkvkHuqOp837F//9vl3Djzyl77UR5EnENvecxOTsZD2siyh8IJJiGpT/Co0pFau1bZwhuzQd9pep6ZgGnGXvBqsKvLBQ8+/c/DgkbPJmbnKs9/Jviv0yLN9pyCoA4wpXIabb0RvXoHpxHZYZWIJzrCNMG2tHaKu6mES+Ze3GUUCCimy9NDjx/t7T749XpFYYTLpqhL0moe/46rQrDfFWB9EWC0rmZ668YECN/fUDlLvVBtdKcSpINwkOWoowK4gvwdKGsc15xZ1ncnSiI18dZElmmwVRYv4SgsaJroI1Cjlox0nC1bfueZNakTuiVnrNPrpGFdsm6sPShI74BtURuxKTLIcllMkGZ0oTd3Vl6inboC4oy0QC5H8REywij8I6KXdx/FGVqJdzedpV+N/6WRiPR3q38EHCquTipFMUi5Qziq6m5n0CLtqxulHG05Td91F73g5tFhf0+KPyM2UmLlew81moBvoK7VEFHYFAlH1POp3gMbzVRSLRSkeEYNAqY/JmzZmszbNz81Ta3iWVHQ6ywx5c/ZyU7Ygvt8ftN8EvgeMLHWj+KGiuChiDDJtqJ0vu5mKBswwjdioB8XB3ltaKB2tSomFsp8C7vBjd8GPhUSf7BLhmwEeBF4vywBfaff6L78PbPTTjH9CYpE2E8DK5V7+X4ABANuaCb3j3gT7AAAAAElFTkSuQmCC"/> ricardo.ch]]></label>
|
| 36 |
<show_in_store>1</show_in_store>
|
| 37 |
</hint>
|
| 38 |
|
| 39 |
+
<global module="diglin_ricento" translate="label comment"><!-- for legacy reason keep "global" -->
|
| 40 |
+
<label>Global Configuration</label>
|
| 41 |
+
<sort_order>5</sort_order>
|
| 42 |
+
<show_in_default>1</show_in_default>
|
| 43 |
+
<show_in_website>1</show_in_website>
|
| 44 |
+
<show_in_store>1</show_in_store>
|
| 45 |
<fields>
|
| 46 |
+
<update_notification>
|
| 47 |
+
<label>Allow Update Notification</label>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 48 |
<frontend_type>select</frontend_type>
|
| 49 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 50 |
+
<comment><![CDATA[If you don't want to receive any notification regarding upcoming update, set this option to "No".]]></comment>
|
| 51 |
+
<sort_order>5</sort_order>
|
| 52 |
<show_in_default>1</show_in_default>
|
| 53 |
<show_in_website>0</show_in_website>
|
| 54 |
<show_in_store>0</show_in_store>
|
| 55 |
+
</update_notification>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 56 |
<merge_order module="diglin_ricento" translate="label comment">
|
| 57 |
<label>Merge Order</label>
|
| 58 |
<frontend_type>select</frontend_type>
|
| 65 |
</merge_order>
|
| 66 |
<!-- @todo Implementation to finish when ricardo.ch API is implemented -->
|
| 67 |
<!--<decrease_inventory module="diglin_ricento" translate="label comment">-->
|
| 68 |
+
<!--<label>Decrease Inventory</label>-->
|
| 69 |
+
<!--<frontend_type>select</frontend_type>-->
|
| 70 |
+
<!--<source_model>adminhtml/system_config_source_yesno</source_model>-->
|
| 71 |
+
<!--<comment><![CDATA[If an order is passed on your shop but the product is also listed on ricardo.ch, do you want to decrease the stock on ricardo.ch side? Be aware, it's not possible to increase the quantity if the order is canceled. It's also not possible to decrease if a bid has been done.]]></comment>-->
|
| 72 |
+
<!--<sort_order>20</sort_order>-->
|
| 73 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 74 |
+
<!--<show_in_website>0</show_in_website>-->
|
| 75 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 76 |
<!--</decrease_inventory>-->
|
| 77 |
<shipping_calculation module="diglin_ricento" translate="label comment">
|
| 78 |
<label>Shipping Calculation</label>
|
| 86 |
</shipping_calculation>
|
| 87 |
<!-- not allowed at the moment -->
|
| 88 |
<!--<email_account_creation module="diglin_ricento" translate="label comment">-->
|
| 89 |
+
<!--<label>Send Account Creation Confirmation Email</label>-->
|
| 90 |
+
<!--<frontend_type>select</frontend_type>-->
|
| 91 |
+
<!--<source_model>adminhtml/system_config_source_yesno</source_model>-->
|
| 92 |
+
<!--<comment><![CDATA[Do you want to send a confirmation email to a customer when his account is imported from ricardo?]]></comment>-->
|
| 93 |
+
<!--<sort_order>40</sort_order>-->
|
| 94 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 95 |
+
<!--<show_in_website>1</show_in_website>-->
|
| 96 |
+
<!--<show_in_store>1</show_in_store>-->
|
| 97 |
<!--</email_account_creation>-->
|
| 98 |
<email_order_creation module="diglin_ricento" translate="label comment">
|
| 99 |
<label>Send Email for new order</label>
|
| 108 |
</fields>
|
| 109 |
</global>
|
| 110 |
|
| 111 |
+
<listing module="diglin_ricento" translate="label comment">
|
| 112 |
+
<label>Product Listing Configuration</label>
|
| 113 |
+
<sort_order>10</sort_order>
|
| 114 |
+
<show_in_default>1</show_in_default>
|
| 115 |
+
<show_in_website>1</show_in_website>
|
| 116 |
+
<show_in_store>1</show_in_store>
|
| 117 |
+
<fields>
|
| 118 |
+
<merge_descriptions translate="label comment">
|
| 119 |
+
<label>Merge Descriptions</label>
|
| 120 |
+
<frontend_type>select</frontend_type>
|
| 121 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 122 |
+
<comment><![CDATA[Merge short and normal descriptions as one content for ricardo product description. The short description will be the first part and the normal description will be the second part of the ricardo article description.]]></comment>
|
| 123 |
+
<sort_order>10</sort_order>
|
| 124 |
+
<show_in_default>1</show_in_default>
|
| 125 |
+
<show_in_website>0</show_in_website>
|
| 126 |
+
<show_in_store>0</show_in_store>
|
| 127 |
+
</merge_descriptions>
|
| 128 |
+
<nl2br>
|
| 129 |
+
<label>Replace Carriage Return with br HTML Tag</label>
|
| 130 |
+
<frontend_type>select</frontend_type>
|
| 131 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 132 |
+
<comment><![CDATA[Do you want to replace into the description the carriage return with <br> HTML Tag?]]></comment>
|
| 133 |
+
<sort_order>20</sort_order>
|
| 134 |
+
<show_in_default>1</show_in_default>
|
| 135 |
+
<show_in_website>0</show_in_website>
|
| 136 |
+
<show_in_store>0</show_in_store>
|
| 137 |
+
</nl2br>
|
| 138 |
+
<placeholder_allowed>
|
| 139 |
+
<label>Allow Image Placeholder</label>
|
| 140 |
+
<frontend_type>select</frontend_type>
|
| 141 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 142 |
+
<comment><![CDATA[In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error.]]></comment>
|
| 143 |
+
<sort_order>30</sort_order>
|
| 144 |
+
<show_in_default>1</show_in_default>
|
| 145 |
+
<show_in_website>0</show_in_website>
|
| 146 |
+
<show_in_store>0</show_in_store>
|
| 147 |
+
</placeholder_allowed>
|
| 148 |
+
|
| 149 |
+
<watermark translate="label" module="catalog">
|
| 150 |
+
<label>Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden</label>
|
| 151 |
+
<frontend_model>diglin_ricento/adminhtml_config_source_heading</frontend_model>
|
| 152 |
+
<sort_order>35</sort_order>
|
| 153 |
+
<show_in_default>1</show_in_default>
|
| 154 |
+
<show_in_website>0</show_in_website>
|
| 155 |
+
<show_in_store>0</show_in_store>
|
| 156 |
+
</watermark>
|
| 157 |
+
<watermark_enabled>
|
| 158 |
+
<label>Allow Watermark</label>
|
| 159 |
+
<frontend_type>select</frontend_type>
|
| 160 |
+
<source_model>diglin_ricento/config_source_watermark</source_model>
|
| 161 |
+
<comment><![CDATA[Yes: fill the other options to provide a correct watermark. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing.]]></comment>
|
| 162 |
+
<sort_order>40</sort_order>
|
| 163 |
+
<show_in_default>1</show_in_default>
|
| 164 |
+
<show_in_website>0</show_in_website>
|
| 165 |
+
<show_in_store>0</show_in_store>
|
| 166 |
+
</watermark_enabled>
|
| 167 |
+
<watermark_size translate="label comment" module="diglin_ricento">
|
| 168 |
+
<label>Watermark Default Size</label>
|
| 169 |
+
<frontend_type>text</frontend_type>
|
| 170 |
+
<sort_order>50</sort_order>
|
| 171 |
+
<show_in_default>1</show_in_default>
|
| 172 |
+
<show_in_website>1</show_in_website>
|
| 173 |
+
<show_in_store>1</show_in_store>
|
| 174 |
+
<comment>Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch</comment>
|
| 175 |
+
<depends>
|
| 176 |
+
<watermark_enabled>1</watermark_enabled>
|
| 177 |
+
</depends>
|
| 178 |
+
</watermark_size>
|
| 179 |
+
<watermark_imageOpacity translate="label comment" module="catalog">
|
| 180 |
+
<label>Watermark Opacity, Percent</label>
|
| 181 |
+
<frontend_type>text</frontend_type>
|
| 182 |
+
<sort_order>60</sort_order>
|
| 183 |
+
<show_in_default>1</show_in_default>
|
| 184 |
+
<show_in_website>1</show_in_website>
|
| 185 |
+
<show_in_store>1</show_in_store>
|
| 186 |
+
<validate>validate-digits validate-digits-range digits-range-0-100</validate>
|
| 187 |
+
<depends>
|
| 188 |
+
<watermark_enabled>1</watermark_enabled>
|
| 189 |
+
</depends>
|
| 190 |
+
</watermark_imageOpacity>
|
| 191 |
+
<watermark_image translate="label comment" module="catalog">
|
| 192 |
+
<label>Watermark</label>
|
| 193 |
+
<frontend_type>image</frontend_type>
|
| 194 |
+
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 195 |
+
<upload_dir config="system/filesystem/media" scope_info="1">catalog/product/watermark/ricento</upload_dir>
|
| 196 |
+
<base_url type="media" scope_info="1">catalog/product/watermark/ricento</base_url>
|
| 197 |
+
<sort_order>70</sort_order>
|
| 198 |
+
<show_in_default>1</show_in_default>
|
| 199 |
+
<show_in_website>1</show_in_website>
|
| 200 |
+
<show_in_store>1</show_in_store>
|
| 201 |
+
<comment>Allowed file types: jpeg, gif, png.</comment>
|
| 202 |
+
<depends>
|
| 203 |
+
<watermark_enabled>1</watermark_enabled>
|
| 204 |
+
</depends>
|
| 205 |
+
</watermark_image>
|
| 206 |
+
<watermark_position translate="label comment" module="catalog">
|
| 207 |
+
<label>Watermark Position</label>
|
| 208 |
+
<frontend_type>select</frontend_type>
|
| 209 |
+
<source_model>adminhtml/system_config_source_watermark_position</source_model>
|
| 210 |
+
<sort_order>80</sort_order>
|
| 211 |
+
<show_in_default>1</show_in_default>
|
| 212 |
+
<show_in_website>1</show_in_website>
|
| 213 |
+
<show_in_store>1</show_in_store>
|
| 214 |
+
<depends>
|
| 215 |
+
<watermark_enabled>1</watermark_enabled>
|
| 216 |
+
</depends>
|
| 217 |
+
</watermark_position>
|
| 218 |
+
</fields>
|
| 219 |
+
</listing>
|
| 220 |
+
|
| 221 |
<api_config module="diglin_ricento" translate="label">
|
| 222 |
<label>API Token Configuration</label>
|
| 223 |
<sort_order>20</sort_order>
|
| 274 |
<show_in_store>0</show_in_store>
|
| 275 |
</email_notification>
|
| 276 |
<!--<simulate_authorization module="diglin_ricento" translate="label comment">-->
|
| 277 |
+
<!--<label>Automatize API Authorization</label>-->
|
| 278 |
+
<!--<frontend_type>select</frontend_type>-->
|
| 279 |
+
<!--<source_model>adminhtml/system_config_source_yesno</source_model>-->
|
| 280 |
+
<!--<comment><![CDATA[After a certain period of time, your API token credentials are not anymore valid and you have to authorize to create a new one. This option allows you to do the process completely automatically without any action of you. However, by enabling this feature, you agree that your ricardo user credentials are stored securely into your own shop database.]]></comment>-->
|
| 281 |
+
<!--<sort_order>1</sort_order>-->
|
| 282 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 283 |
+
<!--<show_in_website>1</show_in_website>-->
|
| 284 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 285 |
<!--</simulate_authorization>-->
|
| 286 |
<!--<ricardo_account module="diglin_ricento" translate="label">-->
|
| 287 |
+
<!--<label>ricardo.ch Account</label>-->
|
| 288 |
+
<!--<sort_order>3</sort_order>-->
|
| 289 |
+
<!--<frontend_model>diglin_ricento/adminhtml_config_source_heading</frontend_model>-->
|
| 290 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 291 |
+
<!--<show_in_website>1</show_in_website>-->
|
| 292 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 293 |
+
<!--<depends>-->
|
| 294 |
+
<!--<simulate_authorization>1</simulate_authorization>-->
|
| 295 |
+
<!--</depends>-->
|
| 296 |
<!--</ricardo_account>-->
|
| 297 |
<!--<ricardo_username module="diglin_ricento" translate="label comment">-->
|
| 298 |
+
<!--<label>ricardo.ch Username</label>-->
|
| 299 |
+
<!--<sort_order>5</sort_order>-->
|
| 300 |
+
<!--<frontend_type>text</frontend_type>-->
|
| 301 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 302 |
+
<!--<show_in_website>1</show_in_website>-->
|
| 303 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 304 |
+
<!--<frontend_class>required-entry</frontend_class>-->
|
| 305 |
+
<!--<comment><![CDATA[Your ricardo.ch username. Create an account on <a href="http://www.ricardo.ch">http://www.ricardo.ch</a> if you don't have one.]]></comment>-->
|
| 306 |
+
<!--<depends>-->
|
| 307 |
+
<!--<simulate_authorization>1</simulate_authorization>-->
|
| 308 |
+
<!--</depends>-->
|
| 309 |
<!--</ricardo_username>-->
|
| 310 |
<!--<ricardo_password module="diglin_ricento" translate="label comment">-->
|
| 311 |
+
<!--<label>ricardo.ch Password</label>-->
|
| 312 |
+
<!--<sort_order>15</sort_order>-->
|
| 313 |
+
<!--<frontend_type>obscure</frontend_type>-->
|
| 314 |
+
<!--<backend_model>adminhtml/system_config_backend_encrypted</backend_model>-->
|
| 315 |
+
<!--<show_in_default>1</show_in_default>-->
|
| 316 |
+
<!--<show_in_website>1</show_in_website>-->
|
| 317 |
+
<!--<show_in_store>0</show_in_store>-->
|
| 318 |
+
<!--<frontend_class>required-entry</frontend_class>-->
|
| 319 |
+
<!--<comment><![CDATA[Your ricardo.ch password. Create an account on <a href="http://www.ricardo.ch">http://www.ricardo.ch</a> if you don't have one.]]></comment>-->
|
| 320 |
+
<!--<depends>-->
|
| 321 |
+
<!--<simulate_authorization>1</simulate_authorization>-->
|
| 322 |
+
<!--</depends>-->
|
| 323 |
<!--</ricardo_password>-->
|
| 324 |
|
| 325 |
<api_de module="diglin_ricento" translate="label comment">
|
app/code/community/Diglin/Ricento/sql/ricento_setup/{upgrade-1.1.0-1.1.2.php → upgrade-1.1.2-1.1.3.php}
RENAMED
|
File without changes
|
app/locale/de_CH/Diglin_Ricento.csv
CHANGED
|
@@ -671,8 +671,17 @@
|
|
| 671 |
"Listing Fees","Einstellgebühren"
|
| 672 |
"ricardo.ch does invoices in %s","ricardo.ch verrechnet ausschliesslich in %s"
|
| 673 |
"Sales Fee (following the <a href=""%s"" target=""_blank"">fees rules from 01.07.2014</a>)","Abschlussgebühren (gemäss <a href=""%s"" target=""_blank"">Gebührenreglement vom 01.07.2014</a>)"
|
| 674 |
-
"With the confirmation of the publication, you accept the <a href=""%s"" target=""_blank"">terms and conditions</a> and <a href=""%s"" target=""_blank"">privacy policy</a>","Mit dem Bestätigen und Publizieren akzeptiere ich die <a href=""%s"" target=""_blank"">AGB</a>und die <a href=""%s"" target=""_blank"">Datenschutzerklärung</a> von ricardo.ch"
|
| 675 |
"Confirm, check and List","Bestätigen, Prüfen und Einstellen"
|
| 676 |
"Send us your configuration","Senden Sie uns Ihre Konfiguration"
|
| 677 |
"Export your configuration","Ihre Konfiguration exportieren"
|
| 678 |
-
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Möchten Sie über Fehler per Email benachrichtigt werden? Emails werden an die Email Adresse des allgemeinen Kontaktes in Magento versendet im Falle von API Fehlermeldungen, Ablauf von Token, etc…"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 671 |
"Listing Fees","Einstellgebühren"
|
| 672 |
"ricardo.ch does invoices in %s","ricardo.ch verrechnet ausschliesslich in %s"
|
| 673 |
"Sales Fee (following the <a href=""%s"" target=""_blank"">fees rules from 01.07.2014</a>)","Abschlussgebühren (gemäss <a href=""%s"" target=""_blank"">Gebührenreglement vom 01.07.2014</a>)"
|
| 674 |
+
"With the confirmation of the publication, you accept the <a href=""%s"" target=""_blank"">terms and conditions</a> and <a href=""%s"" target=""_blank"">privacy policy</a>","Mit dem Bestätigen und Publizieren akzeptiere ich die <a href=""%s"" target=""_blank"">AGB</a> und die <a href=""%s"" target=""_blank"">Datenschutzerklärung</a> von ricardo.ch"
|
| 675 |
"Confirm, check and List","Bestätigen, Prüfen und Einstellen"
|
| 676 |
"Send us your configuration","Senden Sie uns Ihre Konfiguration"
|
| 677 |
"Export your configuration","Ihre Konfiguration exportieren"
|
| 678 |
+
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Möchten Sie über Fehler per Email benachrichtigt werden? Emails werden an die Email Adresse des allgemeinen Kontaktes in Magento versendet im Falle von API Fehlermeldungen, Ablauf von Token, etc…"
|
| 679 |
+
"Allow Image Placeholder","Platzhalter Bild zulassen"
|
| 680 |
+
"In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error.","Sofern ein Problem auftritt bei der Übertragung des Produktbildes an ricardo.ch (Memory Problem, Fehlendes Bild auf dem Server, etc.), möchten Sie Ihr Standard Platzhalter Bild verwenden? Falls ein, wird im Falle eines Problems kein Bild an ricardo.ch übertragen."
|
| 681 |
+
"Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden","Wasserzeichen – Wasserzeichen mit Domain Name Extension (z.B. Mein-Unternehmen.ch) sind verboten."
|
| 682 |
+
"Yes: fill the other options to provide a alternative watermark for the ricardo.ch platform. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing.","Ja: Wählen Sie eine andere Option, um ein alternatives Wasserzeichen für ricardo.ch zu hinterlegen. Nein: Es wird kein Wasserzeichen verwendet. Standard Design Konfiguration verwenden: Ihr Standard Wasserzeichen wird verwendet. Sie können die Darstellung über die Vorschau in der Produkliste überprüfen."
|
| 683 |
+
"Watermark Default Size","Wasserzeichen Standard Grösse."
|
| 684 |
+
"Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch","Beispiel Format: 200x300. Achtung: Maximale Bildgrösse auf riacrdo.ch ist 600x600px."
|
| 685 |
+
"Use default store configuration","Standart Shop Konfiguration verwenden."
|
| 686 |
+
"Allow Update Notification","Erlauben Update Notifizierung"
|
| 687 |
+
"If you don't want to receive any notification regarding upcoming update, set this option to ""No"".","Wenn Sie kein Notifizierung von neue Versionen erhalten, setzen hier ""Nein""."
|
app/locale/de_DE/Diglin_Ricento.csv
CHANGED
|
@@ -671,8 +671,17 @@
|
|
| 671 |
"Listing Fees","Einstellgebühren"
|
| 672 |
"ricardo.ch does invoices in %s","ricardo.ch verrechnet ausschliesslich in %s"
|
| 673 |
"Sales Fee (following the <a href=""%s"" target=""_blank"">fees rules from 01.07.2014</a>)","Abschlussgebühren (gemäss <a href=""%s"" target=""_blank"">Gebührenreglement vom 01.07.2014</a>)"
|
| 674 |
-
"With the confirmation of the publication, you accept the <a href=""%s"" target=""_blank"">terms and conditions</a> and <a href=""%s"" target=""_blank"">privacy policy</a>","Mit dem Bestätigen und Publizieren akzeptiere ich die <a href=""%s"" target=""_blank"">AGB</a>und die <a href=""%s"" target=""_blank"">Datenschutzerklärung</a> von ricardo.ch"
|
| 675 |
"Confirm, check and List","Bestätigen, Prüfen und Einstellen"
|
| 676 |
"Send us your configuration","Senden Sie uns Ihre Konfiguration"
|
| 677 |
"Export your configuration","Ihre Konfiguration exportieren"
|
| 678 |
-
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Möchten Sie über Fehler per Email benachrichtigt werden? Emails werden an die Email Adresse des allgemeinen Kontaktes in Magento versendet im Falle von API Fehlermeldungen, Ablauf von Token, etc…"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 671 |
"Listing Fees","Einstellgebühren"
|
| 672 |
"ricardo.ch does invoices in %s","ricardo.ch verrechnet ausschliesslich in %s"
|
| 673 |
"Sales Fee (following the <a href=""%s"" target=""_blank"">fees rules from 01.07.2014</a>)","Abschlussgebühren (gemäss <a href=""%s"" target=""_blank"">Gebührenreglement vom 01.07.2014</a>)"
|
| 674 |
+
"With the confirmation of the publication, you accept the <a href=""%s"" target=""_blank"">terms and conditions</a> and <a href=""%s"" target=""_blank"">privacy policy</a>","Mit dem Bestätigen und Publizieren akzeptiere ich die <a href=""%s"" target=""_blank"">AGB</a> und die <a href=""%s"" target=""_blank"">Datenschutzerklärung</a> von ricardo.ch"
|
| 675 |
"Confirm, check and List","Bestätigen, Prüfen und Einstellen"
|
| 676 |
"Send us your configuration","Senden Sie uns Ihre Konfiguration"
|
| 677 |
"Export your configuration","Ihre Konfiguration exportieren"
|
| 678 |
+
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Möchten Sie über Fehler per Email benachrichtigt werden? Emails werden an die Email Adresse des allgemeinen Kontaktes in Magento versendet im Falle von API Fehlermeldungen, Ablauf von Token, etc…"
|
| 679 |
+
"Allow Image Placeholder","Platzhalter Bild zulassen"
|
| 680 |
+
"In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error.","Sofern ein Problem auftritt bei der Übertragung des Produktbildes an ricardo.ch (Memory Problem, Fehlendes Bild auf dem Server, etc.), möchten Sie Ihr Standard Platzhalter Bild verwenden? Falls ein, wird im Falle eines Problems kein Bild an ricardo.ch übertragen."
|
| 681 |
+
"Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden","Wasserzeichen – Wasserzeichen mit Domain Name Extension (z.B. Mein-Unternehmen.ch) sind verboten."
|
| 682 |
+
"Yes: fill the other options to provide a alternative watermark for the ricardo.ch platform. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing.","Ja: Wählen Sie eine andere Option, um ein alternatives Wasserzeichen für ricardo.ch zu hinterlegen. Nein: Es wird kein Wasserzeichen verwendet. Standard Design Konfiguration verwenden: Ihr Standard Wasserzeichen wird verwendet. Sie können die Darstellung über die Vorschau in der Produkliste überprüfen."
|
| 683 |
+
"Watermark Default Size","Wasserzeichen Standard Grösse."
|
| 684 |
+
"Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch","Beispiel Format: 200x300. Achtung: Maximale Bildgrösse auf riacrdo.ch ist 600x600px."
|
| 685 |
+
"Use default store configuration","Standart Shop Konfiguration verwenden."
|
| 686 |
+
"Allow Update Notification","Erlauben Update Notifizierung"
|
| 687 |
+
"If you don't want to receive any notification regarding upcoming update, set this option to ""No"".","Wenn Sie kein Notifizierung von neue Versionen erhalten, setzen hier ""Nein""."
|
app/locale/de_DE/template/email/ricento/token_expiration.html
CHANGED
|
@@ -1,9 +1,9 @@
|
|
| 1 |
<!--@subject ricardo.ch API Authorisation renewal for your Magento shop @-->
|
| 2 |
-
|
| 3 |
|
| 4 |
You have to authorize your account to get access to the ricardo.ch API thanks to the ricardo.ch Authorization Page.
|
| 5 |
If you don't do it, your ricardo.ch extension and all related transactions with ricardo.ch will be blocked.
|
| 6 |
|
| 7 |
Please, log in to your <a href="{{var shop_url}}">Magento backend page</a> to follow the instructions displayed in the banner notification.
|
| 8 |
|
| 9 |
-
|
| 1 |
<!--@subject ricardo.ch API Authorisation renewal for your Magento shop @-->
|
| 2 |
+
Dear Admin,
|
| 3 |
|
| 4 |
You have to authorize your account to get access to the ricardo.ch API thanks to the ricardo.ch Authorization Page.
|
| 5 |
If you don't do it, your ricardo.ch extension and all related transactions with ricardo.ch will be blocked.
|
| 6 |
|
| 7 |
Please, log in to your <a href="{{var shop_url}}">Magento backend page</a> to follow the instructions displayed in the banner notification.
|
| 8 |
|
| 9 |
+
Best regards
|
app/locale/en_US/Diglin_Ricento.csv
CHANGED
|
@@ -675,4 +675,13 @@
|
|
| 675 |
"Confirm, check and List","Confirm, check and List"
|
| 676 |
"Send us your configuration","Send us your configuration"
|
| 677 |
"Export your configuration","Export your configuration"
|
| 678 |
-
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc..."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 675 |
"Confirm, check and List","Confirm, check and List"
|
| 676 |
"Send us your configuration","Send us your configuration"
|
| 677 |
"Export your configuration","Export your configuration"
|
| 678 |
+
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc..."
|
| 679 |
+
"Allow Image Placeholder","Allow Image Placeholder"
|
| 680 |
+
"In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error.","In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error."
|
| 681 |
+
"Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden","Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden"
|
| 682 |
+
"Yes: fill the other options to provide a alternative watermark for the ricardo.ch platform. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing.","Yes: fill the other options to provide a alternative watermark for the ricardo.ch platform. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing."
|
| 683 |
+
"Watermark Default Size","Watermark Default Size"
|
| 684 |
+
"Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch","Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch"
|
| 685 |
+
"Use default store configuration","Use default store configuration"
|
| 686 |
+
"Allow Update Notification","Allow Update Notification"
|
| 687 |
+
"If you don't want to receive any notification regarding upcoming update, set this option to ""No"".","If you don't want to receive any notification regarding upcoming update, set this option to ""No""."
|
app/locale/fr_FR/Diglin_Ricento.csv
CHANGED
|
@@ -675,4 +675,14 @@
|
|
| 675 |
"Confirm, check and List","Confirmer, vérifier et lister"
|
| 676 |
"Send us your configuration","Envoyez nous votre configuration"
|
| 677 |
"Export your configuration","Exporter votre configuration"
|
| 678 |
-
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Voulez-vous recevoir un email de notification en cas d'erreur? Les emails sont envoyés au contact principal de la boutique en cas d'erreur avec l'API ou que le token expire, etc..."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 675 |
"Confirm, check and List","Confirmer, vérifier et lister"
|
| 676 |
"Send us your configuration","Envoyez nous votre configuration"
|
| 677 |
"Export your configuration","Exporter votre configuration"
|
| 678 |
+
"Receive email notification in case of error? Email are sent to the main shop contact and are related to API errors, Token expiration, etc...","Voulez-vous recevoir un email de notification en cas d'erreur? Les emails sont envoyés au contact principal de la boutique en cas d'erreur avec l'API ou que le token expire, etc..."
|
| 679 |
+
|
| 680 |
+
"Allow Image Placeholder","Utiliser image par défaut"
|
| 681 |
+
"In case of problem while sending product's picture (e.g. memory problem, missing picture file on your server, etc) into ricardo.ch, do you want to allow to use your default image placeholder? If no, no image will be sent to ricardo.ch in case of error.","En cas de problème lors de l'envoi des images d'un produit vers ricardo.ch (expl. mémoire saturée, fichier manquant sur le serveur, etc), voulez-vous utiliser à la place votre image par défaut. Si non, aucune image ne sera envoyé vers ricardo.ch en cas de problème."
|
| 682 |
+
"Watermark - Watermark with domain name extension (e.g. My-Company.ch) included are forbidden","Filigrane - les filigranes avec un nom de domaine (expl. My-Company.ch) incorporé sont interdites"
|
| 683 |
+
"Yes: fill the other options to provide a alternative watermark for the ricardo.ch platform. No: no watermark will be used at all. Use Default Design Configuration: your default watermark will be used. You can check the result while previewing a product in the product listing.","Oui: remplissez les autres options pour fournir un filigrane spécifique à la plateforme ricardo.ch. Non: aucun filigrane sera utilisé. Utiliser la configuration du design par défaut: le filigrane de votre boutique par défaut sera utilisé. Vous pouvez vérifier le résultat en prévisualisant un produit depuis la liste des produits."
|
| 684 |
+
"Watermark Default Size","Taille par défaut du filigrane"
|
| 685 |
+
"Example format: 200x300. Be aware: Size maximum of a product's picture is 600x600px on ricardo.ch","Example de format: 200x300. Veuillez prendre en compte que la taille de l'image d'un produit sur ricardo.ch est de 600x600px"
|
| 686 |
+
"Use default store configuration","Utiliser la configuration par défaut de la boutique"
|
| 687 |
+
"Allow Update Notification","Autoriser les notifications de mise à jour"
|
| 688 |
+
"If you don't want to receive any notification regarding upcoming update, set this option to ""No"".","Si vous ne souhaitez pas recevoir de notifications concernant les mises à jour futures de l'extension, sélectionnez non."
|
js/ricento/adminhtml.js
CHANGED
|
@@ -563,9 +563,9 @@ Ricento.CategoryMappper.prototype = {
|
|
| 563 |
},
|
| 564 |
|
| 565 |
onCategoryClick: function(event) {
|
| 566 |
-
var link = event.currentTarget;
|
| 567 |
-
this.hideLevel(link.
|
| 568 |
-
if (link.
|
| 569 |
this.chooseCategory(link);
|
| 570 |
} else {
|
| 571 |
this.loadChildren(link);
|
|
@@ -593,7 +593,7 @@ Ricento.CategoryMappper.prototype = {
|
|
| 593 |
$(link.parentNode).select('input').each(function(input) {
|
| 594 |
input.checked = true;
|
| 595 |
});
|
| 596 |
-
$('ricardo_category_selected_title').value = link.
|
| 597 |
$('ricardo_categories_button_save')
|
| 598 |
.enable()
|
| 599 |
.removeClassName('disabled');
|
|
@@ -620,15 +620,15 @@ Ricento.CategoryMappper.prototype = {
|
|
| 620 |
new Ajax.Updater(
|
| 621 |
'ricardo_children',
|
| 622 |
this.loadChildrenUrl
|
| 623 |
-
.replace('#ID#', link.
|
| 624 |
-
.replace('#LVL#', link.
|
| 625 |
{
|
| 626 |
insertion: 'bottom',
|
| 627 |
onComplete: function() {
|
| 628 |
-
if (link.
|
| 629 |
$(self.wrapperElement).addClassName('ricardo_categories_resized');
|
| 630 |
}
|
| 631 |
-
$$('#' + link.
|
| 632 |
item.observe('click', self.onCategoryClick.bind(self));
|
| 633 |
});
|
| 634 |
self.categoriesLoading = false;
|
|
@@ -674,7 +674,6 @@ Ricento.CategoryMappper.prototype = {
|
|
| 674 |
}
|
| 675 |
|
| 676 |
var json = transport.responseText.evalJSON();
|
| 677 |
-
//var suggestions = '';
|
| 678 |
|
| 679 |
Element.hide('loading-mask');
|
| 680 |
clearTimeout = 0;
|
| 563 |
},
|
| 564 |
|
| 565 |
onCategoryClick: function(event) {
|
| 566 |
+
var link = (event.currentTarget) ? event.currentTarget : Event.element(event);
|
| 567 |
+
this.hideLevel(link.getAttribute('data-update-prefix'), link.getAttribute('data-update-level'));
|
| 568 |
+
if (link.getAttribute('data-is-final')) {
|
| 569 |
this.chooseCategory(link);
|
| 570 |
} else {
|
| 571 |
this.loadChildren(link);
|
| 593 |
$(link.parentNode).select('input').each(function(input) {
|
| 594 |
input.checked = true;
|
| 595 |
});
|
| 596 |
+
$('ricardo_category_selected_title').value = link.getAttribute('data-text');
|
| 597 |
$('ricardo_categories_button_save')
|
| 598 |
.enable()
|
| 599 |
.removeClassName('disabled');
|
| 620 |
new Ajax.Updater(
|
| 621 |
'ricardo_children',
|
| 622 |
this.loadChildrenUrl
|
| 623 |
+
.replace('#ID#', link.getAttribute('data-category-id'))
|
| 624 |
+
.replace('#LVL#', link.getAttribute('data-update-level')),
|
| 625 |
{
|
| 626 |
insertion: 'bottom',
|
| 627 |
onComplete: function() {
|
| 628 |
+
if (link.getAttribute('data-update-level') >= self.resizeAtLevel) {
|
| 629 |
$(self.wrapperElement).addClassName('ricardo_categories_resized');
|
| 630 |
}
|
| 631 |
+
$$('#' + link.getAttribute('data-update-prefix') + link.getAttribute('data-update-level') + ' a').each(function(item) {
|
| 632 |
item.observe('click', self.onCategoryClick.bind(self));
|
| 633 |
});
|
| 634 |
self.categoriesLoading = false;
|
| 674 |
}
|
| 675 |
|
| 676 |
var json = transport.responseText.evalJSON();
|
|
|
|
| 677 |
|
| 678 |
Element.hide('loading-mask');
|
| 679 |
clearTimeout = 0;
|
lib/Diglin/Ricardo/.DS_Store
CHANGED
|
Binary file
|
lib/Diglin/Ricardo/Api.php
CHANGED
|
@@ -127,7 +127,9 @@ class Api implements ApiInterface
|
|
| 127 |
|
| 128 |
if ($this->getConfig()->getLogFilePath()) {
|
| 129 |
$dir = dirname($this->getConfig()->getLogFilePath());
|
| 130 |
-
|
|
|
|
|
|
|
| 131 |
if (is_writable($dir . DIRECTORY_SEPARATOR)) {
|
| 132 |
file_put_contents($this->getConfig()->getLogFilePath(), print_r($this->_lastDebug, true) . "\n", FILE_APPEND);
|
| 133 |
}
|
| 127 |
|
| 128 |
if ($this->getConfig()->getLogFilePath()) {
|
| 129 |
$dir = dirname($this->getConfig()->getLogFilePath());
|
| 130 |
+
if (!is_dir($dir)) {
|
| 131 |
+
@mkdir($dir, 0775);
|
| 132 |
+
}
|
| 133 |
if (is_writable($dir . DIRECTORY_SEPARATOR)) {
|
| 134 |
file_put_contents($this->getConfig()->getLogFilePath(), print_r($this->_lastDebug, true) . "\n", FILE_APPEND);
|
| 135 |
}
|
lib/Diglin/Ricardo/Core/Helper.php
CHANGED
|
@@ -62,7 +62,7 @@ class Helper
|
|
| 62 |
$unixTimestamp = time();
|
| 63 |
}
|
| 64 |
|
| 65 |
-
return '/Date(' .
|
| 66 |
}
|
| 67 |
|
| 68 |
/**
|
| 62 |
$unixTimestamp = time();
|
| 63 |
}
|
| 64 |
|
| 65 |
+
return '/Date(' . $unixTimestamp . '000' . date('O') . ')/'; // do not use int cause of issue on 32bit OS
|
| 66 |
}
|
| 67 |
|
| 68 |
/**
|
lib/Diglin/Ricardo/Exceptions/TechnicalException.php
ADDED
|
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Diglin GmbH - Switzerland
|
| 4 |
+
*
|
| 5 |
+
* This file is part of a Diglin GmbH module.
|
| 6 |
+
*
|
| 7 |
+
* This Diglin GmbH module is free software; you can redistribute it and/or
|
| 8 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
| 9 |
+
* published by the Free Software Foundation.
|
| 10 |
+
*
|
| 11 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
| 12 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
| 13 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
| 14 |
+
*
|
| 15 |
+
* @author Sylvain Rayé <support at diglin.com>
|
| 16 |
+
* @category Diglin
|
| 17 |
+
* @package Diglin_Ricardo
|
| 18 |
+
* @copyright Copyright (c) 2011-2015 Diglin (http://www.diglin.com)
|
| 19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
| 20 |
+
*/
|
| 21 |
+
namespace Diglin\Ricardo\Exceptions;
|
| 22 |
+
|
| 23 |
+
/**
|
| 24 |
+
* Class TechnicalException
|
| 25 |
+
* @package Diglin\Ricardo\Exceptions
|
| 26 |
+
* @link https://ws.ricardo.ch/RicardoApi/documentation/html/T_Ricardo_Enums_SecurityErrors.htm
|
| 27 |
+
*/
|
| 28 |
+
class TechnicalException extends ExceptionAbstract {}
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>diglin_ricento</name>
|
| 4 |
-
<version>1.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -38,7 +38,19 @@
|
|
| 38 |
<p>With around 700,000 current offers (auctions and fixed price), 2.5 million brand-name articles on <a href="http://www.ricardoshops">ricardoshops</a>.ch, around 100,000 vehicles plus 35,000 parts and accessories on <a href="http://www.autoricardo.ch">autoricardo.ch</a> and over 2.3 million members, ricardo.ch is the largest online marketplace in Switzerland. Every three minutes somebody buys an article on <a href="http://www.ricardo.ch">ricardo.ch</a> using a mobile device. ricardo.ch AG employs over 140 people in Switzerland and is headquartered in Zug.</p>
|
| 39 |
<h2>About Diglin</h2>
|
| 40 |
<p><a href="http://www.diglin.com">Diglin</a> is the Swiss eCommerce Agency per excellence, realizing your eCommerce project with success. It will accompany along the whole life of your eCommerce project at any levels: conception, realization, design, marketing, logistic, data treatment and management, resource optimization, cost efficiency, increase in turnover, etc. Diglin concentrates its activities mainly with the solutions Magento (eCommerce), OroCRM (CRM) and Akeneo (PIM) and work with its partners highly qualified to provide you the best solutions regarding your needs. </p></description>
|
| 41 |
-
<notes>## Version 1.1.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
- ENHANCEMENT: allow html code for payment information
|
| 43 |
- ENHANCEMENT: prevent unwanted email sending
|
| 44 |
- ENHANCEMENT: add system.log in the configuration export for assistance purpose
|
|
@@ -210,9 +222,9 @@
|
|
| 210 |
- be2b77a Update readme file
|
| 211 |
- 9384e3c Update doc</notes>
|
| 212 |
<authors><author><name>diglin</name><user>diglin</user><email>sly@diglin.com</email></author></authors>
|
| 213 |
-
<date>2015-
|
| 214 |
-
<time>
|
| 215 |
-
<contents><target name="magecommunity"><dir name="Diglin"><dir name="Ricento"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Source"><file name="Heading.php" hash="b433ef94dec29580215fc43109ee8f8c"/><file name="Hint.php" hash="b7a7ba331d22590f59bfe8281241a4f0"/></dir></dir><dir name="Dashboard"><file name="Account.php" hash="8724a08f3683b47aaa2f72496cc70b6e"/><file name="Banner.php" hash="342cbe73ba3b32f9bdc8313149ec931a"/><file name="Bestsellers.php" hash="a9432528b536631a678319e82afeeeec"/><file name="Lifetime.php" hash="e3a70e02e94f980f9d1aaf0ecf9a20bb"/><file name="News.php" hash="6ee052d661649e532b9d1ca4678a572a"/><dir name="Renderer"><file name="Price.php" hash="0fc32c2882a63176370bef21733e9e21"/></dir><file name="Turnover.php" hash="5e6865955e7a9698593a53fec3726676"/></dir><dir name="Form"><dir name="Element"><dir name="Checkboxes"><file name="Extensible.php" hash="bc4c39a051f7a159f5e23dff34ad811d"/></dir><dir name="Fieldset"><file name="Inline.php" hash="292183da97b985cecc1b6d1ce1ee4a35"/></dir><dir name="Radios"><file name="Extensible.php" hash="0bd7bcc853668d572fa21be57bb47575"/></dir><file name=".DS_Store" hash="3005ca0f8e620e6556f5b6dd53202170"/></dir><file name=".DS_Store" hash="ceb8d57fd395cb333d8dc1f85dfcc856"/></dir><dir name="Log"><dir name="Listing"><file name="Grid.php" hash="6d8bf3d0cbeb07df6698ce5e3cc6da61"/></dir><dir name="Sync"><dir name="Grid"><dir name="Renderer"><file name="Progress.php" hash="2c641830c3db9983ea8e43251f72e907"/><file name="Title.php" hash="329af6b8bede66748d82b85524ceae52"/></dir></dir><file name="Grid.php" hash="ed1b6b85b7d94acf4327e2975a953742"/></dir><file name="Tabs.php" hash="e08d00e946c5007c767757d060f2cc6d"/></dir><file name="Log.php" hash="f08554f883e53cc040248edd7118bd4f"/><dir name="Notifications"><file name="Default.php" hash="167bfaa55e28c709dbf3697d7830a71a"/><file name="Expiration.php" hash="df67759b72214cd362b0db736b585859"/></dir><dir name="Page"><file name="Menu.php" hash="0a6dde8103fb1444621ccdf484957c02"/></dir><dir name="Products"><dir name="Category"><file name="Children.php" hash="307e037abc251848b0694b3529edfbfc"/><dir name="Form"><dir name="Renderer"><file name="Categories.php" hash="76c3af26e9c3aa7c3d9f09d941997d57"/><file name="Mapping.php" hash="577e4fc684f8939deba30eb67dbd174c"/></dir></dir><dir name="Mapping"><file name="Tree.php" hash="524d1d3387fbaa130552aca4e0591598"/></dir><file name="Mapping.php" hash="cc5b960ad5aa5a25380435eccb157856"/><dir name="Tree"><file name="Categories.php" hash="515975899617d335d6976e27ef7b573d"/><file name="Form.php" hash="d81bbe3285b496dc3c14625aa9b91e03"/></dir><file name="Tree.php" hash="8aa9c622715b021a8e857410b881b68c"/></dir><dir name="Listing"><file name="Confirmation.php" hash="cdb2ceca5b00a34d5a947c91ca722cd6"/><dir name="Edit"><file name="Form.php" hash="e1a9fe7cab032a32ca3407a76ce7fbee"/><dir name="Renderer"><file name="Article.php" hash="cf0e96bc078ab23d5641f6f2022749c8"/><file name="Configured.php" hash="4660b7102533fa42a83eb37603cc76a7"/><file name="Customoptions.php" hash="64d5d9a0b2fb3a97145cee69eda09e0c"/><file name="Inventory.php" hash="d31d8c271abb1a78f3699064aaa506dc"/><file name="Name.php" hash="bb38f3924522574e64ba6e811ff46450"/><file name="Price.php" hash="b6112891273ff496374b2778227b4143"/><file name="Status.php" hash="b114cd85e41eca64fe57a6ff51d5ee43"/></dir><dir name="Tabs"><file name="General.php" hash="e698b88441f5b94cf1680d13668f0b3f"/><dir name="Products"><file name="Add.php" hash="13e1ebc227ba3518b9ec3bb600acd83c"/><file name="Massaction.php" hash="e9abc1d73fee5e1bb85569a80f37b9e5"/></dir><file name="Products.php" hash="33ffa7e18f36d06801bda306a477f563"/><file name="Rules.php" hash="7b913d102970f46fb8db6ec409322d7c"/><file name="Selloptions.php" hash="111b94ee6039995882b30f29ccbce570"/></dir><file name="Tabs.php" hash="6c3df947696a88a2509cfcf25a28c38b"/></dir><file name="Edit.php" hash="3218bc52a42c197113e595e09bf15623"/><dir name="Form"><file name="Abstract.php" hash="aa96a74bc83b7dae21a982812eb6fd90"/></dir><dir name="Grid"><dir name="Renderer"><file name="Status.php" hash="2ca46572afce5bf098489430a33c8592"/><file name="Total.php" hash="9570d3f5b50c043c0444d5fb3411f6f2"/></dir></dir><file name="Grid.php" hash="1d5c9ccc35e37b036754f41e950deda1"/><dir name="Item"><dir name="Edit"><file name="Form.php" hash="780650cb73819b55b355fe01119f703c"/><dir name="Tabs"><file name="Rules.php" hash="f8488f76c14247e25a61da9b03df0593"/><file name="Selloptions.php" hash="d4613fae72dd1fe3c68bff8419a82750"/></dir><file name="Tabs.php" hash="5d0781303281ae745d3609f907bd19d2"/></dir><file name="Edit.php" hash="b6ee4c68d4cd7732cfe0cdb3c488409f"/><file name="Preview.php" hash="ae9a2130c8488a90a17f9f86ab41e569"/></dir><file name="Log.php" hash="039a8bce6ee15ad9c49eb0d427c55c83"/><dir name="New"><file name="Form.php" hash="38ab04ded807490619a0e3b1cb75c9e0"/></dir><file name="New.php" hash="59eea06c9b8ec22162c3fcaeba2933e1"/></dir><file name="Listing.php" hash="8d604c1f0dab741cef0a06cb9065cdbc"/></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Button.php" hash="67d754bed74b6389355d554b255e7488"/></dir></dir></dir></dir><file name=".DS_Store" hash="d7a2be9199a341b8ef1d7deab1c4d4f9"/></dir><dir name="Payment"><file name="Info.php" hash="c63a717a400752ec569657d2cd418195"/></dir><file name=".DS_Store" hash="743561b5031e5615f3d8b6bf7ed70f10"/></dir><dir name="Controller"><dir name="Adminhtml"><file name="Action.php" hash="cc992630b53816a388b8294775d27265"/><dir name="Products"><file name="Listing.php" hash="4d8ff57f2ec9e1f95253a4c577528816"/></dir></dir><file name=".DS_Store" hash="c32a70b9223330120d51e6eab360718f"/></dir><file name="Exception.php" hash="93c9bde391933089d1e6632cea5ad786"/><dir name="Helper"><file name="Api.php" hash="67ae3a1cc9a3a6ba9db34ed327865ae6"/><dir name="Dashboard"><file name="Turnover.php" hash="eda721699f2e5cf8e298e0024a63a545"/></dir><file name="Data.php" hash="5a2143e2637a947906f1ec2343a633fd"/><file name="Image.php" hash="9d96d815fcd3028c5f0711bb8e904c12"/><file name="Price.php" hash="fe835532e818eb8cd22adcae4f23561e"/><file name="Support.php" hash="173d57541c5544188f0f0435d436b1b6"/><file name="Tools.php" hash="13c923ae2c56e8305e481cb27570212d"/></dir><dir name="Model"><dir name="Api"><dir name="Services"><file name="Abstract.php" hash="d0c76c198a2c69c199e726da03abc7a6"/><file name="Customer.php" hash="d500e9e9035ffd8500407611f6796ad9"/><file name="Search.php" hash="d40fd404bfb3a2d5de9d6020df14b483"/><file name="Security.php" hash="d5f1d425155e4749344850e7b09feb22"/><file name="Sell.php" hash="8b4476223aa515032bf311da5c4c548f"/><file name="Selleraccount.php" hash="c0d31d32fee8b7c6347b81202a1ba0e5"/><file name="System.php" hash="7c20e49754e5e93503fc3ef7e4918dc8"/></dir><file name="Token.php" hash="a4145e890cafbd223fa42ba5b477c025"/></dir><dir name="Config"><dir name="Source"><file name="Abstract.php" hash="d671ca4f2f26f145f5fad2e30b532124"/><file name="Categories.php" hash="f982ceecede3d42547a08e6a36f49218"/><file name="Languages.php" hash="2c03657ebf714148b73cb3f15ef4488c"/><dir name="Products"><dir name="Listing"><file name="Log.php" hash="ba3a7d1e422755cd6739bed8820066c0"/><file name="Status.php" hash="170990ec2272e76863bbdc88be6a023b"/></dir></dir><dir name="Rules"><file name="Payment.php" hash="4d14509c99fa3c4fc26037b246f78265"/><dir name="Shipping"><file name="Availability.php" hash="f97891bf6fdf0765d0289c43bb457a97"/><file name="Calculation.php" hash="912f16d303a9b401d1de9d37296dde0a"/><file name="Packages.php" hash="d4ce5652ae2a80eeb8839290dfb64ee6"/></dir><file name="Shipping.php" hash="e66853a3ea9b51a0900fdadba935ae42"/></dir><dir name="Sales"><file name="Currency.php" hash="b07535355281a36f3b7e358d23a77e15"/><file name="Days.php" hash="5643dd61f80ccc52cbe29e75f18df2d9"/><dir name="Order"><file name="Status.php" hash="a3718bb7ab59b4d60748dee241888651"/></dir><dir name="Price"><file name="Method.php" hash="020a8e8d0d9d35802ea88c0028af4673"/><file name="Source.php" hash="94c5e4b5eb86ced80e5412159e6cf0f4"/></dir><dir name="Product"><dir name="Condition"><file name="Source.php" hash="14849df28b52facc5d91f462e9a90781"/></dir><file name="Condition.php" hash="32faa3b36d1b7de9577798578152d044"/></dir><file name="Promotion.php" hash="dfd838cfe50880d8d2facbf3b062b398"/><file name="Reactivation.php" hash="33d9dd75eeb119eb3b05bbb4dda8e432"/><file name="Template.php" hash="ccffc7632cd03d87f0245cd801d0bae5"/><file name="Type.php" hash="6f545897bbe8b99d5b30e4102279b827"/><file name="Warranty.php" hash="8762d38677d82bc8048e3d5d88b36eae"/></dir><file name="Status.php" hash="c617e9ada56a3d41cabdea79695db149"/><file name="Store.php" hash="6930c1537e4ebf98885d5c333bec3ffa"/><dir name="Sync"><file name="Progress.php" hash="d0430a73504085929ba5f8a3e867da07"/><file name="Status.php" hash="f4b8e72c905175730b3d566dee80ade6"/><file name="Type.php" hash="bafd71290733c7c480595fb61ec81227"/></dir><file name="Website.php" hash="c0168510dc5252a0689416959882136b"/></dir></dir><file name="Cron.php" hash="a85f45baff623088bb1138daa3b42a2b"/><dir name="Dispatcher"><file name="Abstract.php" hash="541cd3d29760026a61c6721e0ca686fb"/><dir name="Check"><file name="List.php" hash="6b9eef4d652debf6be1b333b73b737a0"/></dir><file name="Closed.php" hash="52464c4e48c494569354f6cc5b53ecaf"/><file name="List.php" hash="6e98480008fe6cc4e2c83602f8b9476c"/><file name="Order.php" hash="62543dafe93a6e98d1eed1c09c128a1f"/><file name="Stop.php" hash="e055d0a3ecd0fbb3605cb3b36a7a5bd4"/><dir name="Sync"><file name="List.php" hash="eb4cc8966d896098fa452a917b0d41e6"/></dir></dir><file name="Dispatcher.php" hash="d00fda597c8a294d6d133aceb0f7c922"/><dir name="Entity"><dir name="Attribute"><dir name="Source"><file name="Conditions.php" hash="1223272c226b7bf7d1c6c61f27ef687e"/></dir></dir><file name=".DS_Store" hash="fe83316145ece365c6a0215405354801"/></dir><file name="Filter.php" hash="ec774cc9129c39ca4b1daf39eff0e59d"/><file name="Observer.php" hash="3ecec681ab0b48833e48b49487886432"/><dir name="Products"><dir name="Category"><file name="Mapping.php" hash="b6df1431d7310759e5be17f29eb10df0"/></dir><file name="Category.php" hash="642f0520f549d520e9050a0286a56358"/><dir name="Listing"><dir name="Item"><file name="Product.php" hash="c64d6d91f1ef3f89b7fdbb3f19f50973"/></dir><file name="Item.php" hash="cd0751fc89700c3a7aa401d56604ee5c"/><file name="Log.php" hash="992e843bdfd54aeac481cf6b2c678dbc"/><file name=".DS_Store" hash="575220a7c4e08b15c60e4631b4986261"/></dir><file name="Listing.php" hash="8877ce70cb6ddb612e2f25ccfc3092c3"/><file name=".DS_Store" hash="878470ebfba5923e0c52147480052eda"/></dir><dir name="Resource"><dir name="Api"><dir name="Token"><file name="Collection.php" hash="d2ab663440e27258841be3cf4a357a70"/></dir><file name="Token.php" hash="9899e9aa48e2ee7d416e840d575fff47"/></dir><dir name="Products"><dir name="Listing"><file name="Collection.php" hash="19b8f5d9d0107c897151d91e0cbae08e"/><dir name="Item"><file name="Collection.php" hash="c1d27c28e0c52f6f15641fe90cf2fba8"/></dir><file name="Item.php" hash="450a69ddd9023a40d1431f4a5c93a7db"/><dir name="Log"><file name="Collection.php" hash="c0b02c61246b76a31f2673931d90e985"/></dir><file name="Log.php" hash="514311bff0eee5b00e775c8b59b8b5a1"/></dir><file name="Listing.php" hash="afc905d5ba69ba5ddb7ee5fd946a8c2f"/></dir><dir name="Rule"><file name="Collection.php" hash="9c35a937efb27fe3fd57616621035ceb"/></dir><file name="Rule.php" hash="2ec8533cbc357e2a204dcf6bcbdb2d88"/><dir name="Sales"><dir name="Options"><file name="Collection.php" hash="fbc1af66e9ce3c33f47cab4853d5bd3e"/></dir><file name="Options.php" hash="dbb7e3ecf2c1716cdbbc8fa81b25bdda"/><dir name="Transaction"><file name="Collection.php" hash="f661980fd6a907df331cd7df1f211dd0"/></dir><file name="Transaction.php" hash="f81eb7d223ab9357598199150c1281a2"/></dir><dir name="Sync"><file name="Abstract.php" hash="15030d2414b0ad5dc99b56cd656f92e8"/><dir name="Job"><file name="Collection.php" hash="b9bd2b8a3a7271524e65898a5f1fbd68"/><dir name="Listing"><file name="Collection.php" hash="a713a5910489912448c85a9987635a45"/></dir><file name="Listing.php" hash="44ec78a770948d9504c1138ce1f41fe1"/></dir><file name="Job.php" hash="a7496261d34501fc9a5c56a87110c688"/></dir></dir><file name="Rule.php" hash="4ff575a44898a6b63cdb22dc1c3bb180"/><dir name="Sales"><dir name="Method"><file name="Payment.php" hash="9ba10f1ceb6f4a97cb02a852afbb7e15"/><file name="Shipping.php" hash="2c7a63fe51d57deaf2cbc9c6ede6099b"/></dir><file name="Options.php" hash="d6bb5ab7343e79f2341113b8b6a123d0"/><dir name="Order"><file name="Create.php" hash="fa28733d72ddc214510f64f559189bf3"/><file name="Exception.php" hash="74d31df9035a6145563b25e9a5b0324b"/></dir><file name="Transaction.php" hash="81133f876c4988ebcf89f9bad6a19cd3"/><file name=".DS_Store" hash="fc3f9eaffb36b68be6d5f78dd42aa4de"/></dir><file name="SplAutoloader.php" hash="5c3aa48d6c93900c10625b8e92279672"/><dir name="Sync"><file name="Abstract.php" hash="fc6ac3f307ea104c66fe4e758dd3a4a9"/><dir name="Job"><file name="Listing.php" hash="593875bf5d4d5588b684e39d833779b7"/></dir><file name="Job.php" hash="2374eb34968c83e0dde1b8aa684419f2"/></dir><dir name="Validate"><dir name="Products"><file name="Item.php" hash="873052730fad87d240b60070d2be7db0"/></dir><dir name="Rules"><file name="Methods.php" hash="9dcfc409d29f8eeb301c109212f1956e"/></dir><dir name="Sales"><file name="Increment.php" hash="1f92ec9c6ca26d34bdb3981e777bda14"/></dir></dir><file name=".DS_Store" hash="553e418160037f4cbfb052e5441a987a"/></dir><dir name="Test"><dir name="Model"><dir name="Rule"><dir name="Validate"><dir name="expectations"><file name="testPaymentMethodCombinations.yaml" hash="c1070f1ae555a8c32a7761980e589857"/></dir><dir name="providers"><file name="testPaymentMethodCombinations.yaml" hash="0dfd5c1d335e10540607a391b33a9a2c"/></dir></dir><file name="Validate.php" hash="08260abb9a0bd685da4097916dfddc31"/></dir><dir name="Sales"><dir name="Validate"><dir name="Increment"><dir name="expectations"><file name="testStartPriceIncrementCombination.yaml" hash="15ffe7bd8373cda25aed179c08171881"/></dir><dir name="providers"><file name="testStartPriceIncrementCombination.yaml" hash="345726c8c358be678a93c38fbff504dc"/></dir></dir><file name="Increment.php" hash="e32cd91e3f683e5300cbb91ad6f2f093"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="AccountController.php" hash="384f2a7243924800fec9c10fcd9c912d"/><file name="ApiController.php" hash="9a1c834f6089fc6a027e470a915e5bbd"/><file name="DashboardController.php" hash="7f8935c4ca61e3b06181eec134d4649a"/><file name="IndexController.php" hash="e54b2a0a6e0e6ef898a22840683825dc"/><file name="LogController.php" hash="2102931b5793049ca3878b5767898e6a"/><dir name="Products"><file name="CategoryController.php" hash="a17f3bb5a8b0e1aec601d3d0e264fc2f"/><dir name="Listing"><file name="ItemController.php" hash="a7552ac3d1b36bd524b9a841c85e88ef"/></dir><file name="ListingController.php" hash="56caa8820ace97ff3bf0560e1be87e35"/></dir><file name="SupportController.php" hash="3bfca97a48b6f81fddd30518ef241962"/><file name="SyncController.php" hash="77315fd98363dab57a60bdd7b2e85c87"/></dir><file name=".DS_Store" hash="65204f7675cda0c4f9d7fd5069370de7"/></dir><dir name="data"><dir name="ricento_setup"><file name="data-install-1.0.0.php" hash="738f1d059e3968daea8592615106c7cf"/><file name="data-upgrade-1.0.18-1.1.0.php" hash="7f4480a5e13d64529e87219bc7f3348e"/></dir><file name=".DS_Store" hash="5617a58254bcd0775ce28c476de08b69"/></dir><dir name="etc"><file name="adminhtml.xml" hash="fb068ec1a5e6b6630bd13cf060d540bb"/><file name="config.xml" hash="0c9200fbea789ec3cb8d2fc8db5ee5a0"/><file name="jstranslator.xml" hash="3a4a6307012f9660f925863659b38a2f"/><file name="system.xml" hash="0f0ff91da43aeeff664effde11cc68ec"/><file name="uninstall.txt" hash="660b44580246f818f8e22f4c5a530c9b"/></dir><dir name="sql"><dir name="ricento_setup"><file name="install-1.0.0.php" hash="bc9f3b05ae68e0d8899a066384566801"/><file name="uninstall.php" hash="d0e2d68583a950374796b1d817c2958f"/><file name="upgrade-1.0.18-1.1.0.php" hash="fcf5dae1df75bbd2bca9193eef430d75"/><file name="upgrade-1.0.8-1.0.9.php" hash="47e0ce995ae6d7aff77245cbf05d0832"/><file name="upgrade-1.1.0-1.1.2.php" hash="c0c6c88441cd7aa216b04b512f4a44bc"/></dir></dir><file name=".DS_Store" hash="ff79823aee2df60e6912aa0d1cd5b071"/></dir></dir></target><target name="magelib"><dir name="Diglin"><dir name="Ricardo"><file name="Api.php" hash="dd24e52c73e1d8fcc4659c773418fa4c"/><dir name="Composer"><file name="Magento.php" hash="2b1396d290496bd8e744d6d5b0be797e"/></dir><file name="Config.php" hash="1045568136c433270ddc178025d96a87"/><dir name="Core"><file name="ApiInterface.php" hash="c5a36ca69d27d76d913a2c4cb2d5876e"/><file name="ConfigInterface.php" hash="cd5d8d9eb5e0dd6946d4caf63f0cf6b2"/><file name="Helper.php" hash="2485c9b90faaacf30dfd989adc0961f0"/></dir><dir name="Enums"><file name="AbstractEnums.php" hash="8e401abbc33bdbab34223bb3f4950166"/><dir name="Article"><file name="ArticlesTypes.php" hash="e13b730e4c5656091305c6e8a1031b8f"/><file name="CloseListStatus.php" hash="d67f65e3de13cf6747e6e10bc0c1bb21"/><file name="InternalReferenceType.php" hash="6c8eddab52eea86efb142999f76e7b65"/><file name="PromotionCode.php" hash="67c1026f8d2e31e02083c99bdc1250b3"/><file name="Warranty.php" hash="ec403c6fe606572fdb7e92eda4e2eff0"/></dir><file name="ArticleErrors.php" hash="705927167cdc08eb4ada7d7ce055af22"/><dir name="Customer"><file name="ArticleTypeFilter.php" hash="1ae6e485167cb19da3eadd12efe9cc42"/><file name="OpenArticlesSortBy.php" hash="7b73af00d1a0af79ffa33d0281d2af28"/><file name="PaidStatusFilter.php" hash="b6ff931bebcfa37a09a5cab04fdb7448"/><file name="ShippedStatusFilter.php" hash="c906c8a60ea6e91f68bf1015dce18177"/><file name="SoldArticlesSortBy.php" hash="80c3241b09c3f61a1711a449404667e0"/></dir><file name="CustomerErrors.php" hash="38588fb9c5a425d490593dc5f23eb2d7"/><file name="GeneralErrors.php" hash="65c4369f521e99dfe8f20f0b0b5d67a3"/><file name="PaymentMethods.php" hash="4bfcb7bc7ab1181cb8cc544f050b5d6b"/><file name="PictureErrors.php" hash="ad7e4888ec4b8b43ab70b2154de4adc0"/><file name="PictureExtension.php" hash="9f76c645e57efed13f52d74c23a687e6"/><file name="SearchErrors.php" hash="f16b01e7d62b76734a38776e546beb7f"/><file name="SecurityErrors.php" hash="cb6112e33a4d8fb318e84e028181838b"/><dir name="System"><file name="CategoryArticleType.php" hash="8b680d1791cafec2e43907b144ad63c8"/><file name="CategoryBrandingFilter.php" hash="c7eb8c9d61adb8cc76ae3c47638fcfab"/><file name="LanguageCode.php" hash="6998c880c44fbdbe3b60321818976b9a"/><file name="LanguageId.php" hash="bcef589026b025591b4fa6bb9328fbbd"/></dir><file name=".DS_Store" hash="cb1fb86d332d6cf020d9991723302c24"/></dir><dir name="Exceptions"><file name="ArticleException.php" hash="b5290b26c6e711e6f1074f9d6687c066"/><file name="CurlException.php" hash="b1fa36bf6f663f942ec444dcc1e75044"/><file name="CustomerException.php" hash="d011aad98f970733f7eefe369f53fee6"/><file name="ExceptionAbstract.php" hash="8c868ba9a1a200aae3b59240b01faa70"/><file name="GeneralException.php" hash="18d42b47fd69a9b427cb4427a5d56e56"/><file name="PictureException.php" hash="ba3f6cc087f6b0103ecc96b4357ab0ac"/><file name="SearchException.php" hash="ecd9902786eecb50414d3dd7e01b3492"/><file name="SecurityException.php" hash="b4b500a3f2abdc3bc957284d5fbc42a9"/></dir><dir name="Managers"><file name="Customer.php" hash="e2b3241594fecb5ef944466b34c8fbfe"/><file name="ManagerAbstract.php" hash="13dca083592bd0651f06a03fe9dd589a"/><file name="ParameterAbstract.php" hash="e9725c5915f48d375bef33f377247083"/><dir name="Search"><dir name="Parameter"><file name="GetCategoryBestMatchParameter.php" hash="14619ec6f6dc3e45d68930189cd27ec9"/></dir></dir><file name="Search.php" hash="3c8d6d52031bf00a9eeb672b291f43ae"/><file name="Security.php" hash="b9dd72f0724ec454d023b4767b687116"/><dir name="Sell"><dir name="Parameter"><file name="AddArticlePicturesParameter.php" hash="8e607c9579f951f94a9bed199acc1145"/><file name="AppendArticleDescriptionParameter.php" hash="f38f51ff97640e024a4c08cc6eeab652"/><file name="AppendDescriptionParameter.php" hash="8140c7d52d1f33dbe621e889251b923f"/><file name="ArticleDeliveryParameter.php" hash="538e9e573bc7b81083e3febc8e325cf5"/><file name="ArticleDescriptionParameter.php" hash="98fef4f221b9f3a11ee9078bfd5116f0"/><file name="ArticleInformationParameter.php" hash="9900793d70875a80ca47d5d3e98691a9"/><file name="ArticleInternalReferenceParameter.php" hash="84cf8bcf50e6dda593b4f9570e1f6ed9"/><file name="ArticlePictureParameter.php" hash="aa7c36ccb2144513a9ea7b27966d2f3b"/><file name="BaseInsertArticleWithTrackingParameter.php" hash="5fdeb6656f1b0ebdf9fb76c8ba5973df"/><file name="CloseArticleParameter.php" hash="7f0a426ba4b277d9c02be87b5725cc45"/><file name="CloseArticlesParameter.php" hash="cbdc9f2045c7e1b440b5252d63717947"/><file name="ClosePlannedArticleParameter.php" hash="5ee0ee9a0b79098ee38bf0a4f8420551"/><file name="DeletePlannedArticleParameter.php" hash="f86cb01ff7cb1b91ece3191cde3cf6e1"/><file name="DeletePlannedArticlesParameter.php" hash="5b094b5537aad744945877c2885cde3f"/><file name="GetArticleFeeParameter.php" hash="926f8960ce9162686d1eee03002ef5ca"/><file name="GetArticlesFeeParameter.php" hash="8d37fced5969657911facef553bf1f04"/><file name="InsertArticleParameter.php" hash="23707dad2636f8e0dda5423769f9e175"/><file name="InsertArticlesParameter.php" hash="4a6cdef758e32538ff4495d383567a4d"/><file name="UpdateArticleParameter.php" hash="d9291f525d389cc2c45be6ad2d5213ea"/><file name="UpdateArticlePicturesParameter.php" hash="33962ef42331f70924399e6ddfcad2fc"/></dir></dir><file name="Sell.php" hash="988998c316defb953db0c1a673ad7c52"/><dir name="SellerAccount"><dir name="Parameter"><file name="ArticlesParameter.php" hash="45b41edc80da0abca182528299e6013c"/><file name="ClosedArticlesParameter.php" hash="b45eb7085da6129b1b91218865016dcb"/><file name="OpenArticlesParameter.php" hash="601558abc262ec42d9d00f7ea7c0b044"/><file name="PlannedArticleParameter.php" hash="95c671b72c8b31a4dd396271bc5d13a2"/><file name="PlannedArticlesParameter.php" hash="f68737054ccda8cd5893f2448cbed2ee"/><file name="SoldArticlesParameter.php" hash="31aa25a901627cabf5b55c7f66a74f1b"/><file name="UnsoldArticlesParameter.php" hash="75e878f0d7fb1b9ed5a72278fb433d78"/></dir></dir><file name="SellerAccount.php" hash="0b85ab146483730609c1ab6ecd7ba974"/><file name="System.php" hash="c2b865dcfc0875cd417ec902dc759f69"/><file name=".DS_Store" hash="3f55d6d43043ccddf4ea7c5fc66d8c7d"/></dir><file name="Service.php" hash="697c4d014f6d70f223c21b7e90bbb82f"/><dir name="Services"><file name="Customer.php" hash="465b82a364b820d53312e57973abb6f4"/><file name="Search.php" hash="33f94a39029c57289a76bb85e2e05e13"/><file name="Security.php" hash="3e82163587f9f61ea52c24f706335251"/><file name="Sell.php" hash="e2b5c21046de7dc4c1822c94072f9449"/><file name="SellerAccount.php" hash="f01153d60678c43470a873fa83d6ae20"/><file name="ServiceAbstract.php" hash="41b0fcbaff2a2df4baa925c58028a39b"/><file name="System.php" hash="ed174d4b1b1113fe512a6e0d5c4c5164"/></dir><file name=".DS_Store" hash="427aa215b493870e633d065d3e546b86"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Diglin_Ricento.xml" hash="0400f55950fe9fd6c4782d6a25096efd"/></dir></target><target name="mageweb"><dir name="js"><dir name="ricento"><file name="Countable.js" hash="dc66f2e57b917e39f897f254bcc8ec1b"/><file name="adminhtml.js" hash="bee0f33367405c89f93a86512dbd8b22"/><dir name="livepipe-ui"><file name="livepipe.js" hash="d15a0747cdc197a7f7081d5be4f20d01"/><file name="progressbar.js" hash="2153c666af9b91c65111124665cb57f7"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ricento.xml" hash="47215c6d724221414017e391ec0f692b"/></dir><dir name="template"><dir name="ricento"><dir name="dashboard"><file name="account.phtml" hash="ad9d11463db769518a00fcf2d8f1bbb5"/><file name="banner.phtml" hash="9233cbde4520f4419ca87691906b48c5"/><file name="bestsellers.phtml" hash="c48282d7a83354f8054b20b751b9852e"/><file name="lifeturnover.phtml" hash="09c399dcd6aa68cb503c987a43aa3dce"/><file name="news.phtml" hash="799bab071c5a7b20b4c81f99824d3bc0"/><file name="toolbar.phtml" hash="49f2571e6545ca3cebfb027904381b56"/><dir name="turnover"><file name="graph.phtml" hash="96117aecbc0a074884357713482e5878"/></dir><file name="turnover.phtml" hash="0a85c63eef0863076504ee479c419e60"/></dir><file name="dashboard.phtml" hash="9f5db0d087823f15e6d428ae6dd773ec"/><file name="iframe.phtml" hash="e256fa4dec9eadf41f7c2b5f10ba48bd"/><dir name="js"><dir name="rules"><dir name="validate"><file name="paymentshipping.phtml" hash="8977da22325a8c1f469ce7eb4166f793"/></dir></dir><dir name="salesoptions"><dir name="validate"><file name="increment.phtml" hash="22d268c8498ad4ee3d6a18bdf42d2c26"/></dir></dir><dir name="sync"><file name="progress.phtml" hash="6e8c2dff5d024c7cb093b4df56f46ff3"/></dir></dir><file name="log.phtml" hash="1402eabd3eb946784c59c68a724738d9"/><dir name="notifications"><file name="configured.phtml" hash="f36530088576fdc4836a40012700f252"/><file name="expiration.phtml" hash="01d21a1804692ee9a83f9dd3f05d407b"/></dir><dir name="payment"><dir name="info"><file name="default.phtml" hash="73254e7af8ebd279f6f4156e88e8f465"/><dir name="pdf"><file name="default.phtml" hash="5ea160a594ac5569c0f32a46cd472e14"/></dir></dir></dir><dir name="products"><dir name="category"><file name="children.phtml" hash="bfe6d5d5ba7cb24f4a0f3344af224f0c"/><dir name="mapping"><file name="tree.phtml" hash="3dabf207a79d32b143e00b397c4a041b"/></dir><file name="mapping.phtml" hash="25edee745a8baddd81556292976ec368"/></dir><dir name="listing"><file name="confirmation.phtml" hash="4a33fc972a5ccb1088b3f631d88b053c"/><dir name="item"><dir name="edit"><file name="form.phtml" hash="15557d807e5aa6b5b34285729e04c3af"/></dir><file name="preview.phtml" hash="2d40dcc958496d49f8f2a72d96e37d91"/></dir></dir></dir><file name="stats.phtml" hash="a2d523de72ac055fe9b85f923d2e7910"/><file name="support.phtml" hash="421232ce2c120b8e0aa1f4828a228fc8"/><dir name="sync"><dir name="check"><file name="popup.phtml" hash="4acc891d7ae7cb4cb07bc51ced5b438b"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ricento"><dir name="payment"><dir name="info"><file name="default.phtml" hash="73254e7af8ebd279f6f4156e88e8f465"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="ricento"><dir name="css"><dir name="images"><file name="ajax-loader.gif" hash="73e57937304d89f251e7e540a24b095a"/><file name="arrow_sans_right_32.gif" hash="276b86bab75976c98e3c5202916d927a"/><file name="monotone_check_yes_ok.png" hash="b7b1d4c572e0c2ed10435a802549ae64"/><file name="ricardo_16x16.png" hash="5987591334d1b58f66ae4db2683fa8fd"/><file name="ricardo_32x32.png" hash="0635c69692c26a4bd4707a91336d9b3b"/><file name="settings_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><file name="window_maximize.png" hash="0f9c031e141822fed135270e34b128d5"/><file name="window_minimize.png" hash="62e6795471543a0eff14a07bf271d8d7"/></dir><file name="ricento.css" hash="8e7a0eddc9ee5855043f2da3915fcbc5"/></dir><dir name="images"><file name="KB.png" hash="187e953f8ebf9fe5829ec31427ff853b"/><file name="banner.png" hash="0b34711f9cdd44f07baef2b9b9536391"/><file name="contact.png" hash="85ed8d8113a897128ab1263e23b69dbb"/><file name="diglin.png" hash="cb24b7fec64fd8f906375d497b7e5e0f"/><file name="diglin@2x.png" hash="0e834d7839f61e789db16c028100b6ff"/><file name="github.png" hash="548d544d642e6afbba46dd2482f95af3"/><file name="online-support-48.png" hash="70f55fb3bc678875eaf53dfb214d7d3d"/><file name="ricardo.png" hash="21beeb511cf31d16ebc6b9d947806447"/><file name="ricardo@2x.png" hash="af83978f369def1e4e87fc06e4903c61"/><file name="settings-13-48.png" hash="3dc22c1da4f952687699e5fc23028232"/><file name="sinchronize-48.png" hash="15735cf3ca563303d9e981faba075750"/><file name="statistics-48.png" hash="38046c16959de9ee22b1679d4ddf3909"/><file name="view-details-48.png" hash="a8bbab2e728f1723e9e17dce5f939b22"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Diglin_Ricento.csv" hash="9fd6942f75642cabd8e443b40301a616"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="token_expiration.html" hash="d0214f1f7905f50328a1e13b0dd7a72d"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Diglin_Ricento.csv" hash="271be12c233d047c0551794db4923a30"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="token_expiration.html" hash="995fb9dea103f6efffc9c392efa160b7"/></dir></dir></dir></dir><dir name="de_DE"><file name="Diglin_Ricento.csv" hash="e34d2f9e90763c182abf716a1af67961"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="support.html" hash="6e381c94546829bfb963276e51cf731b"/><file name="token_expiration.html" hash="6e965f33aaf0734b3f61147b19a254ee"/></dir></dir></dir></dir><dir name="de_CH"><file name="Diglin_Ricento.csv" hash="e34d2f9e90763c182abf716a1af67961"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/></dir></dir></dir></dir></target></contents>
|
| 216 |
<compatible/>
|
| 217 |
<dependencies><required><php><min>5.3.2</min><max>5.6.0</max></php></required></dependencies>
|
| 218 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>diglin_ricento</name>
|
| 4 |
+
<version>1.1.3</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 38 |
<p>With around 700,000 current offers (auctions and fixed price), 2.5 million brand-name articles on <a href="http://www.ricardoshops">ricardoshops</a>.ch, around 100,000 vehicles plus 35,000 parts and accessories on <a href="http://www.autoricardo.ch">autoricardo.ch</a> and over 2.3 million members, ricardo.ch is the largest online marketplace in Switzerland. Every three minutes somebody buys an article on <a href="http://www.ricardo.ch">ricardo.ch</a> using a mobile device. ricardo.ch AG employs over 140 people in Switzerland and is headquartered in Zug.</p>
|
| 39 |
<h2>About Diglin</h2>
|
| 40 |
<p><a href="http://www.diglin.com">Diglin</a> is the Swiss eCommerce Agency per excellence, realizing your eCommerce project with success. It will accompany along the whole life of your eCommerce project at any levels: conception, realization, design, marketing, logistic, data treatment and management, resource optimization, cost efficiency, increase in turnover, etc. Diglin concentrates its activities mainly with the solutions Magento (eCommerce), OroCRM (CRM) and Akeneo (PIM) and work with its partners highly qualified to provide you the best solutions regarding your needs. </p></description>
|
| 41 |
+
<notes>## Version 1.1.3
|
| 42 |
+
- ENHANCEMENT: add notifications to get news about the extension when updates are available. This can be via the configuration disabled.
|
| 43 |
+
- ENHANCEMENT: add configuration options for watermark picture to publish products with a specific watermark for the ricardo.ch platform
|
| 44 |
+
- ENHANCEMENT: add configuration options to allow or not to use the product image placeholder of a shop owner in case of issue with missing picture files on server or in case of memory limit error
|
| 45 |
+
- FIX: missing transactions import when products were already sold
|
| 46 |
+
- FIX: prevent to stop an article if it has been sold but has been automatically reactivated on ricardo.ch side
|
| 47 |
+
- FIX: status of products was not correctly set when a product is sold and internally saved
|
| 48 |
+
- FIX: display of category mapping popup on IE < 9
|
| 49 |
+
- FIX: confirmation fees popup on IE all versions
|
| 50 |
+
- FIX: issue when trying to warm up product pictures while saving product listing items with products having no picture basic selection
|
| 51 |
+
- FIX: price calculation when orders are imported into a non Swiss shop
|
| 52 |
+

|
| 53 |
+
## Version 1.1.2
|
| 54 |
- ENHANCEMENT: allow html code for payment information
|
| 55 |
- ENHANCEMENT: prevent unwanted email sending
|
| 56 |
- ENHANCEMENT: add system.log in the configuration export for assistance purpose
|
| 222 |
- be2b77a Update readme file
|
| 223 |
- 9384e3c Update doc</notes>
|
| 224 |
<authors><author><name>diglin</name><user>diglin</user><email>sly@diglin.com</email></author></authors>
|
| 225 |
+
<date>2015-05-08</date>
|
| 226 |
+
<time>10:52:22</time>
|
| 227 |
+
<contents><target name="magecommunity"><dir name="Diglin"><dir name="Ricento"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Source"><file name="Heading.php" hash="b433ef94dec29580215fc43109ee8f8c"/><file name="Hint.php" hash="b7a7ba331d22590f59bfe8281241a4f0"/></dir></dir><dir name="Dashboard"><file name="Account.php" hash="8724a08f3683b47aaa2f72496cc70b6e"/><file name="Banner.php" hash="342cbe73ba3b32f9bdc8313149ec931a"/><file name="Bestsellers.php" hash="a9432528b536631a678319e82afeeeec"/><file name="Lifetime.php" hash="e3a70e02e94f980f9d1aaf0ecf9a20bb"/><file name="News.php" hash="6ee052d661649e532b9d1ca4678a572a"/><dir name="Renderer"><file name="Price.php" hash="0fc32c2882a63176370bef21733e9e21"/></dir><file name="Turnover.php" hash="5e6865955e7a9698593a53fec3726676"/></dir><dir name="Form"><dir name="Element"><dir name="Checkboxes"><file name="Extensible.php" hash="bc4c39a051f7a159f5e23dff34ad811d"/></dir><dir name="Fieldset"><file name="Inline.php" hash="292183da97b985cecc1b6d1ce1ee4a35"/></dir><dir name="Radios"><file name="Extensible.php" hash="0bd7bcc853668d572fa21be57bb47575"/></dir></dir></dir><dir name="Log"><dir name="Listing"><file name="Grid.php" hash="6d8bf3d0cbeb07df6698ce5e3cc6da61"/></dir><dir name="Sync"><dir name="Grid"><dir name="Renderer"><file name="Progress.php" hash="2c641830c3db9983ea8e43251f72e907"/><file name="Title.php" hash="329af6b8bede66748d82b85524ceae52"/></dir></dir><file name="Grid.php" hash="ed1b6b85b7d94acf4327e2975a953742"/></dir><file name="Tabs.php" hash="e08d00e946c5007c767757d060f2cc6d"/></dir><file name="Log.php" hash="f08554f883e53cc040248edd7118bd4f"/><dir name="Notifications"><file name="Default.php" hash="167bfaa55e28c709dbf3697d7830a71a"/><file name="Expiration.php" hash="df67759b72214cd362b0db736b585859"/></dir><dir name="Page"><file name="Menu.php" hash="0a6dde8103fb1444621ccdf484957c02"/></dir><dir name="Products"><dir name="Category"><file name="Children.php" hash="307e037abc251848b0694b3529edfbfc"/><dir name="Form"><dir name="Renderer"><file name="Categories.php" hash="76c3af26e9c3aa7c3d9f09d941997d57"/><file name="Mapping.php" hash="577e4fc684f8939deba30eb67dbd174c"/></dir></dir><dir name="Mapping"><file name="Tree.php" hash="524d1d3387fbaa130552aca4e0591598"/></dir><file name="Mapping.php" hash="cc5b960ad5aa5a25380435eccb157856"/><dir name="Tree"><file name="Categories.php" hash="515975899617d335d6976e27ef7b573d"/><file name="Form.php" hash="d81bbe3285b496dc3c14625aa9b91e03"/></dir><file name="Tree.php" hash="8aa9c622715b021a8e857410b881b68c"/></dir><dir name="Listing"><file name="Confirmation.php" hash="cdb2ceca5b00a34d5a947c91ca722cd6"/><dir name="Edit"><file name="Form.php" hash="e1a9fe7cab032a32ca3407a76ce7fbee"/><dir name="Renderer"><file name="Article.php" hash="cf0e96bc078ab23d5641f6f2022749c8"/><file name="Configured.php" hash="4660b7102533fa42a83eb37603cc76a7"/><file name="Customoptions.php" hash="64d5d9a0b2fb3a97145cee69eda09e0c"/><file name="Inventory.php" hash="d31d8c271abb1a78f3699064aaa506dc"/><file name="Name.php" hash="bb38f3924522574e64ba6e811ff46450"/><file name="Price.php" hash="b6112891273ff496374b2778227b4143"/><file name="Status.php" hash="b114cd85e41eca64fe57a6ff51d5ee43"/></dir><dir name="Tabs"><file name="General.php" hash="14d287a2fc7ff8913697be143f79a367"/><dir name="Products"><file name="Add.php" hash="13e1ebc227ba3518b9ec3bb600acd83c"/><file name="Massaction.php" hash="e9abc1d73fee5e1bb85569a80f37b9e5"/></dir><file name="Products.php" hash="33ffa7e18f36d06801bda306a477f563"/><file name="Rules.php" hash="7b913d102970f46fb8db6ec409322d7c"/><file name="Selloptions.php" hash="111b94ee6039995882b30f29ccbce570"/></dir><file name="Tabs.php" hash="6c3df947696a88a2509cfcf25a28c38b"/></dir><file name="Edit.php" hash="3218bc52a42c197113e595e09bf15623"/><dir name="Form"><file name="Abstract.php" hash="aa96a74bc83b7dae21a982812eb6fd90"/></dir><dir name="Grid"><dir name="Renderer"><file name="Status.php" hash="842be30b0586aa7481c91bd68928b955"/><file name="Total.php" hash="9570d3f5b50c043c0444d5fb3411f6f2"/></dir></dir><file name="Grid.php" hash="1d5c9ccc35e37b036754f41e950deda1"/><dir name="Item"><dir name="Edit"><file name="Form.php" hash="780650cb73819b55b355fe01119f703c"/><dir name="Tabs"><file name="Rules.php" hash="f8488f76c14247e25a61da9b03df0593"/><file name="Selloptions.php" hash="d4613fae72dd1fe3c68bff8419a82750"/></dir><file name="Tabs.php" hash="5d0781303281ae745d3609f907bd19d2"/></dir><file name="Edit.php" hash="b6ee4c68d4cd7732cfe0cdb3c488409f"/><file name="Preview.php" hash="3389aca73aff4caff4ac9ea1084553b0"/></dir><file name="Log.php" hash="039a8bce6ee15ad9c49eb0d427c55c83"/><dir name="New"><file name="Form.php" hash="38ab04ded807490619a0e3b1cb75c9e0"/></dir><file name="New.php" hash="59eea06c9b8ec22162c3fcaeba2933e1"/></dir><file name="Listing.php" hash="8d604c1f0dab741cef0a06cb9065cdbc"/></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Button.php" hash="67d754bed74b6389355d554b255e7488"/></dir></dir></dir></dir></dir><dir name="Payment"><file name="Info.php" hash="c63a717a400752ec569657d2cd418195"/></dir></dir><dir name="Controller"><dir name="Adminhtml"><file name="Action.php" hash="cc992630b53816a388b8294775d27265"/><dir name="Products"><file name="Listing.php" hash="cf5edd43dc606d6a4621c8a1fd92f195"/></dir></dir></dir><file name="Exception.php" hash="93c9bde391933089d1e6632cea5ad786"/><dir name="Helper"><file name="Api.php" hash="67ae3a1cc9a3a6ba9db34ed327865ae6"/><dir name="Dashboard"><file name="Turnover.php" hash="eda721699f2e5cf8e298e0024a63a545"/></dir><file name="Data.php" hash="8310e82ad673289ba8aa839e3490c082"/><file name="Image.php" hash="f7a1b6113d68cad54a56b5054f3adcaf"/><file name="Price.php" hash="ef6cb7106ba52582621e2a59de2553e4"/><file name="Support.php" hash="3cca6b96cc057332d86dca6c41822eba"/><file name="Tools.php" hash="13c923ae2c56e8305e481cb27570212d"/></dir><dir name="Model"><dir name="Api"><dir name="Services"><file name="Abstract.php" hash="d0c76c198a2c69c199e726da03abc7a6"/><file name="Customer.php" hash="d500e9e9035ffd8500407611f6796ad9"/><file name="Search.php" hash="d40fd404bfb3a2d5de9d6020df14b483"/><file name="Security.php" hash="d5f1d425155e4749344850e7b09feb22"/><file name="Sell.php" hash="8b4476223aa515032bf311da5c4c548f"/><file name="Selleraccount.php" hash="c0d31d32fee8b7c6347b81202a1ba0e5"/><file name="System.php" hash="7c20e49754e5e93503fc3ef7e4918dc8"/></dir><file name="Token.php" hash="a4145e890cafbd223fa42ba5b477c025"/></dir><dir name="Config"><dir name="Source"><file name="Abstract.php" hash="d671ca4f2f26f145f5fad2e30b532124"/><file name="Categories.php" hash="f982ceecede3d42547a08e6a36f49218"/><file name="Languages.php" hash="2c03657ebf714148b73cb3f15ef4488c"/><dir name="Products"><dir name="Listing"><file name="Log.php" hash="ba3a7d1e422755cd6739bed8820066c0"/><file name="Status.php" hash="170990ec2272e76863bbdc88be6a023b"/></dir></dir><dir name="Rules"><file name="Payment.php" hash="4d14509c99fa3c4fc26037b246f78265"/><dir name="Shipping"><file name="Availability.php" hash="f97891bf6fdf0765d0289c43bb457a97"/><file name="Calculation.php" hash="912f16d303a9b401d1de9d37296dde0a"/><file name="Packages.php" hash="d4ce5652ae2a80eeb8839290dfb64ee6"/></dir><file name="Shipping.php" hash="e66853a3ea9b51a0900fdadba935ae42"/></dir><dir name="Sales"><file name="Currency.php" hash="b07535355281a36f3b7e358d23a77e15"/><file name="Days.php" hash="5643dd61f80ccc52cbe29e75f18df2d9"/><dir name="Order"><file name="Status.php" hash="a3718bb7ab59b4d60748dee241888651"/></dir><dir name="Price"><file name="Method.php" hash="020a8e8d0d9d35802ea88c0028af4673"/><file name="Source.php" hash="94c5e4b5eb86ced80e5412159e6cf0f4"/></dir><dir name="Product"><dir name="Condition"><file name="Source.php" hash="14849df28b52facc5d91f462e9a90781"/></dir><file name="Condition.php" hash="32faa3b36d1b7de9577798578152d044"/></dir><file name="Promotion.php" hash="dfd838cfe50880d8d2facbf3b062b398"/><file name="Reactivation.php" hash="33d9dd75eeb119eb3b05bbb4dda8e432"/><file name="Template.php" hash="ccffc7632cd03d87f0245cd801d0bae5"/><file name="Type.php" hash="6f545897bbe8b99d5b30e4102279b827"/><file name="Warranty.php" hash="8762d38677d82bc8048e3d5d88b36eae"/></dir><file name="Status.php" hash="813afb1e443192b1d6a7d9937e56cafd"/><file name="Store.php" hash="6930c1537e4ebf98885d5c333bec3ffa"/><dir name="Sync"><file name="Progress.php" hash="d0430a73504085929ba5f8a3e867da07"/><file name="Status.php" hash="f4b8e72c905175730b3d566dee80ade6"/><file name="Type.php" hash="bafd71290733c7c480595fb61ec81227"/></dir><file name="Watermark.php" hash="75b4bb2d4e63e970483ce3043ca33a7b"/><file name="Website.php" hash="c0168510dc5252a0689416959882136b"/></dir></dir><file name="Cron.php" hash="a85f45baff623088bb1138daa3b42a2b"/><dir name="Dispatcher"><file name="Abstract.php" hash="541cd3d29760026a61c6721e0ca686fb"/><dir name="Check"><file name="List.php" hash="6b9eef4d652debf6be1b333b73b737a0"/></dir><file name="Closed.php" hash="95bba1d63f07d9aa568a25cc38a45017"/><file name="List.php" hash="b13bea7fa0aaa4bbe69eb6e09d7037a4"/><file name="Order.php" hash="cf04e621f997703459a0c7ee8a673b74"/><file name="Stop.php" hash="b825e86b920e1f3d4863a5e5c10a6f80"/><dir name="Sync"><file name="List.php" hash="eb4cc8966d896098fa452a917b0d41e6"/></dir></dir><file name="Dispatcher.php" hash="d00fda597c8a294d6d133aceb0f7c922"/><dir name="Entity"><dir name="Attribute"><dir name="Source"><file name="Conditions.php" hash="1223272c226b7bf7d1c6c61f27ef687e"/></dir></dir></dir><file name="Feed.php" hash="fecf4fead5bf6ab0742a8b8b2cb39dea"/><file name="Filter.php" hash="ec774cc9129c39ca4b1daf39eff0e59d"/><file name="Observer.php" hash="3ecec681ab0b48833e48b49487886432"/><dir name="Products"><dir name="Category"><file name="Mapping.php" hash="b6df1431d7310759e5be17f29eb10df0"/></dir><file name="Category.php" hash="642f0520f549d520e9050a0286a56358"/><dir name="Listing"><dir name="Item"><file name="Product.php" hash="c64d6d91f1ef3f89b7fdbb3f19f50973"/></dir><file name="Item.php" hash="2d1728f3d266b5801af6334ef0b17b82"/><file name="Log.php" hash="992e843bdfd54aeac481cf6b2c678dbc"/></dir><file name="Listing.php" hash="8877ce70cb6ddb612e2f25ccfc3092c3"/></dir><dir name="Resource"><dir name="Api"><dir name="Token"><file name="Collection.php" hash="d2ab663440e27258841be3cf4a357a70"/></dir><file name="Token.php" hash="9899e9aa48e2ee7d416e840d575fff47"/></dir><dir name="Products"><dir name="Listing"><file name="Collection.php" hash="19b8f5d9d0107c897151d91e0cbae08e"/><dir name="Item"><file name="Collection.php" hash="c1d27c28e0c52f6f15641fe90cf2fba8"/></dir><file name="Item.php" hash="450a69ddd9023a40d1431f4a5c93a7db"/><dir name="Log"><file name="Collection.php" hash="c0b02c61246b76a31f2673931d90e985"/></dir><file name="Log.php" hash="514311bff0eee5b00e775c8b59b8b5a1"/></dir><file name="Listing.php" hash="450a3122ecd268a8714f90d06bd01328"/></dir><dir name="Rule"><file name="Collection.php" hash="9c35a937efb27fe3fd57616621035ceb"/></dir><file name="Rule.php" hash="2ec8533cbc357e2a204dcf6bcbdb2d88"/><dir name="Sales"><dir name="Options"><file name="Collection.php" hash="fbc1af66e9ce3c33f47cab4853d5bd3e"/></dir><file name="Options.php" hash="dbb7e3ecf2c1716cdbbc8fa81b25bdda"/><dir name="Transaction"><file name="Collection.php" hash="f661980fd6a907df331cd7df1f211dd0"/></dir><file name="Transaction.php" hash="f81eb7d223ab9357598199150c1281a2"/></dir><dir name="Sync"><file name="Abstract.php" hash="15030d2414b0ad5dc99b56cd656f92e8"/><dir name="Job"><file name="Collection.php" hash="b9bd2b8a3a7271524e65898a5f1fbd68"/><dir name="Listing"><file name="Collection.php" hash="a713a5910489912448c85a9987635a45"/></dir><file name="Listing.php" hash="44ec78a770948d9504c1138ce1f41fe1"/></dir><file name="Job.php" hash="a7496261d34501fc9a5c56a87110c688"/></dir></dir><file name="Rule.php" hash="4ff575a44898a6b63cdb22dc1c3bb180"/><dir name="Sales"><dir name="Method"><file name="Payment.php" hash="9ba10f1ceb6f4a97cb02a852afbb7e15"/><file name="Shipping.php" hash="2c7a63fe51d57deaf2cbc9c6ede6099b"/></dir><file name="Options.php" hash="d6bb5ab7343e79f2341113b8b6a123d0"/><dir name="Order"><file name="Create.php" hash="fa28733d72ddc214510f64f559189bf3"/><file name="Exception.php" hash="74d31df9035a6145563b25e9a5b0324b"/></dir><file name="Transaction.php" hash="81133f876c4988ebcf89f9bad6a19cd3"/></dir><file name="SplAutoloader.php" hash="5c3aa48d6c93900c10625b8e92279672"/><dir name="Sync"><file name="Abstract.php" hash="fc6ac3f307ea104c66fe4e758dd3a4a9"/><dir name="Job"><file name="Listing.php" hash="593875bf5d4d5588b684e39d833779b7"/></dir><file name="Job.php" hash="2374eb34968c83e0dde1b8aa684419f2"/></dir><dir name="Validate"><dir name="Products"><file name="Item.php" hash="873052730fad87d240b60070d2be7db0"/></dir><dir name="Rules"><file name="Methods.php" hash="9dcfc409d29f8eeb301c109212f1956e"/></dir><dir name="Sales"><file name="Increment.php" hash="1f92ec9c6ca26d34bdb3981e777bda14"/></dir></dir></dir><dir name="Test"><dir name="Model"><file name="Feed.php" hash="21c43e7f00928e1679a51ba1a77f0802"/><dir name="Rule"><dir name="Validate"><dir name="expectations"><file name="testPaymentMethodCombinations.yaml" hash="c1070f1ae555a8c32a7761980e589857"/></dir><dir name="providers"><file name="testPaymentMethodCombinations.yaml" hash="0dfd5c1d335e10540607a391b33a9a2c"/></dir></dir><file name="Validate.php" hash="08260abb9a0bd685da4097916dfddc31"/></dir><dir name="Sales"><dir name="Validate"><dir name="Increment"><dir name="expectations"><file name="testStartPriceIncrementCombination.yaml" hash="15ffe7bd8373cda25aed179c08171881"/></dir><dir name="providers"><file name="testStartPriceIncrementCombination.yaml" hash="345726c8c358be678a93c38fbff504dc"/></dir></dir><file name="Increment.php" hash="e32cd91e3f683e5300cbb91ad6f2f093"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="AccountController.php" hash="384f2a7243924800fec9c10fcd9c912d"/><file name="ApiController.php" hash="9a1c834f6089fc6a027e470a915e5bbd"/><file name="DashboardController.php" hash="7f8935c4ca61e3b06181eec134d4649a"/><file name="IndexController.php" hash="e54b2a0a6e0e6ef898a22840683825dc"/><file name="LogController.php" hash="2102931b5793049ca3878b5767898e6a"/><dir name="Products"><file name="CategoryController.php" hash="a40797fa2b687890099b4b52725e4337"/><dir name="Listing"><file name="ItemController.php" hash="6348c7d28a736ed54228864f70544e20"/></dir><file name="ListingController.php" hash="0626e2eee1aa3addfe07231a5dbfd1d5"/></dir><file name="SupportController.php" hash="3bfca97a48b6f81fddd30518ef241962"/><file name="SyncController.php" hash="77315fd98363dab57a60bdd7b2e85c87"/></dir></dir><dir name="data"><dir name="ricento_setup"><file name="data-install-1.0.0.php" hash="738f1d059e3968daea8592615106c7cf"/><file name="data-upgrade-1.0.18-1.1.0.php" hash="7f4480a5e13d64529e87219bc7f3348e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="48d0016b44d8f0851094ecfff462541e"/><file name="config.xml" hash="7e1318767c30e245018464846a7ef7ba"/><file name="jstranslator.xml" hash="3a4a6307012f9660f925863659b38a2f"/><file name="system.xml" hash="384b63cc90c23de9b9ac8a19d98c949b"/><file name="uninstall.txt" hash="660b44580246f818f8e22f4c5a530c9b"/></dir><dir name="sql"><dir name="ricento_setup"><file name="install-1.0.0.php" hash="bc9f3b05ae68e0d8899a066384566801"/><file name="uninstall.php" hash="d0e2d68583a950374796b1d817c2958f"/><file name="upgrade-1.0.18-1.1.0.php" hash="fcf5dae1df75bbd2bca9193eef430d75"/><file name="upgrade-1.0.8-1.0.9.php" hash="47e0ce995ae6d7aff77245cbf05d0832"/><file name="upgrade-1.1.2-1.1.3.php" hash="c0c6c88441cd7aa216b04b512f4a44bc"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Diglin"><dir name="Ricardo"><file name="Api.php" hash="134fa85c9b0103979ad93ab67250c5f0"/><dir name="Composer"><file name="Magento.php" hash="2b1396d290496bd8e744d6d5b0be797e"/></dir><file name="Config.php" hash="1045568136c433270ddc178025d96a87"/><dir name="Core"><file name="ApiInterface.php" hash="c5a36ca69d27d76d913a2c4cb2d5876e"/><file name="ConfigInterface.php" hash="cd5d8d9eb5e0dd6946d4caf63f0cf6b2"/><file name="Helper.php" hash="4695227c2c6ddb099559fd688b54aa60"/></dir><dir name="Enums"><file name="AbstractEnums.php" hash="8e401abbc33bdbab34223bb3f4950166"/><dir name="Article"><file name="ArticlesTypes.php" hash="e13b730e4c5656091305c6e8a1031b8f"/><file name="CloseListStatus.php" hash="d67f65e3de13cf6747e6e10bc0c1bb21"/><file name="InternalReferenceType.php" hash="6c8eddab52eea86efb142999f76e7b65"/><file name="PromotionCode.php" hash="67c1026f8d2e31e02083c99bdc1250b3"/><file name="Warranty.php" hash="ec403c6fe606572fdb7e92eda4e2eff0"/></dir><file name="ArticleErrors.php" hash="705927167cdc08eb4ada7d7ce055af22"/><dir name="Customer"><file name="ArticleTypeFilter.php" hash="1ae6e485167cb19da3eadd12efe9cc42"/><file name="OpenArticlesSortBy.php" hash="7b73af00d1a0af79ffa33d0281d2af28"/><file name="PaidStatusFilter.php" hash="b6ff931bebcfa37a09a5cab04fdb7448"/><file name="ShippedStatusFilter.php" hash="c906c8a60ea6e91f68bf1015dce18177"/><file name="SoldArticlesSortBy.php" hash="80c3241b09c3f61a1711a449404667e0"/></dir><file name="CustomerErrors.php" hash="38588fb9c5a425d490593dc5f23eb2d7"/><file name="GeneralErrors.php" hash="65c4369f521e99dfe8f20f0b0b5d67a3"/><file name="PaymentMethods.php" hash="4bfcb7bc7ab1181cb8cc544f050b5d6b"/><file name="PictureErrors.php" hash="ad7e4888ec4b8b43ab70b2154de4adc0"/><file name="PictureExtension.php" hash="9f76c645e57efed13f52d74c23a687e6"/><file name="SearchErrors.php" hash="f16b01e7d62b76734a38776e546beb7f"/><file name="SecurityErrors.php" hash="cb6112e33a4d8fb318e84e028181838b"/><dir name="System"><file name="CategoryArticleType.php" hash="8b680d1791cafec2e43907b144ad63c8"/><file name="CategoryBrandingFilter.php" hash="c7eb8c9d61adb8cc76ae3c47638fcfab"/><file name="LanguageCode.php" hash="6998c880c44fbdbe3b60321818976b9a"/><file name="LanguageId.php" hash="bcef589026b025591b4fa6bb9328fbbd"/></dir><file name=".DS_Store" hash="cb1fb86d332d6cf020d9991723302c24"/></dir><dir name="Exceptions"><file name="ArticleException.php" hash="b5290b26c6e711e6f1074f9d6687c066"/><file name="CurlException.php" hash="b1fa36bf6f663f942ec444dcc1e75044"/><file name="CustomerException.php" hash="d011aad98f970733f7eefe369f53fee6"/><file name="ExceptionAbstract.php" hash="8c868ba9a1a200aae3b59240b01faa70"/><file name="GeneralException.php" hash="18d42b47fd69a9b427cb4427a5d56e56"/><file name="PictureException.php" hash="ba3f6cc087f6b0103ecc96b4357ab0ac"/><file name="SearchException.php" hash="ecd9902786eecb50414d3dd7e01b3492"/><file name="SecurityException.php" hash="b4b500a3f2abdc3bc957284d5fbc42a9"/><file name="TechnicalException.php" hash="fdad217159c2c995ef4415e6f6383456"/></dir><dir name="Managers"><file name="Customer.php" hash="e2b3241594fecb5ef944466b34c8fbfe"/><file name="ManagerAbstract.php" hash="13dca083592bd0651f06a03fe9dd589a"/><file name="ParameterAbstract.php" hash="e9725c5915f48d375bef33f377247083"/><dir name="Search"><dir name="Parameter"><file name="GetCategoryBestMatchParameter.php" hash="14619ec6f6dc3e45d68930189cd27ec9"/></dir></dir><file name="Search.php" hash="3c8d6d52031bf00a9eeb672b291f43ae"/><file name="Security.php" hash="b9dd72f0724ec454d023b4767b687116"/><dir name="Sell"><dir name="Parameter"><file name="AddArticlePicturesParameter.php" hash="8e607c9579f951f94a9bed199acc1145"/><file name="AppendArticleDescriptionParameter.php" hash="f38f51ff97640e024a4c08cc6eeab652"/><file name="AppendDescriptionParameter.php" hash="8140c7d52d1f33dbe621e889251b923f"/><file name="ArticleDeliveryParameter.php" hash="538e9e573bc7b81083e3febc8e325cf5"/><file name="ArticleDescriptionParameter.php" hash="98fef4f221b9f3a11ee9078bfd5116f0"/><file name="ArticleInformationParameter.php" hash="9900793d70875a80ca47d5d3e98691a9"/><file name="ArticleInternalReferenceParameter.php" hash="84cf8bcf50e6dda593b4f9570e1f6ed9"/><file name="ArticlePictureParameter.php" hash="aa7c36ccb2144513a9ea7b27966d2f3b"/><file name="BaseInsertArticleWithTrackingParameter.php" hash="5fdeb6656f1b0ebdf9fb76c8ba5973df"/><file name="CloseArticleParameter.php" hash="7f0a426ba4b277d9c02be87b5725cc45"/><file name="CloseArticlesParameter.php" hash="cbdc9f2045c7e1b440b5252d63717947"/><file name="ClosePlannedArticleParameter.php" hash="5ee0ee9a0b79098ee38bf0a4f8420551"/><file name="DeletePlannedArticleParameter.php" hash="f86cb01ff7cb1b91ece3191cde3cf6e1"/><file name="DeletePlannedArticlesParameter.php" hash="5b094b5537aad744945877c2885cde3f"/><file name="GetArticleFeeParameter.php" hash="926f8960ce9162686d1eee03002ef5ca"/><file name="GetArticlesFeeParameter.php" hash="8d37fced5969657911facef553bf1f04"/><file name="InsertArticleParameter.php" hash="23707dad2636f8e0dda5423769f9e175"/><file name="InsertArticlesParameter.php" hash="4a6cdef758e32538ff4495d383567a4d"/><file name="UpdateArticleParameter.php" hash="d9291f525d389cc2c45be6ad2d5213ea"/><file name="UpdateArticlePicturesParameter.php" hash="33962ef42331f70924399e6ddfcad2fc"/></dir></dir><file name="Sell.php" hash="988998c316defb953db0c1a673ad7c52"/><dir name="SellerAccount"><dir name="Parameter"><file name="ArticlesParameter.php" hash="45b41edc80da0abca182528299e6013c"/><file name="ClosedArticlesParameter.php" hash="b45eb7085da6129b1b91218865016dcb"/><file name="OpenArticlesParameter.php" hash="601558abc262ec42d9d00f7ea7c0b044"/><file name="PlannedArticleParameter.php" hash="95c671b72c8b31a4dd396271bc5d13a2"/><file name="PlannedArticlesParameter.php" hash="f68737054ccda8cd5893f2448cbed2ee"/><file name="SoldArticlesParameter.php" hash="31aa25a901627cabf5b55c7f66a74f1b"/><file name="UnsoldArticlesParameter.php" hash="75e878f0d7fb1b9ed5a72278fb433d78"/></dir></dir><file name="SellerAccount.php" hash="0b85ab146483730609c1ab6ecd7ba974"/><file name="System.php" hash="c2b865dcfc0875cd417ec902dc759f69"/><file name=".DS_Store" hash="3f55d6d43043ccddf4ea7c5fc66d8c7d"/></dir><file name="Service.php" hash="697c4d014f6d70f223c21b7e90bbb82f"/><dir name="Services"><file name="Customer.php" hash="465b82a364b820d53312e57973abb6f4"/><file name="Search.php" hash="33f94a39029c57289a76bb85e2e05e13"/><file name="Security.php" hash="3e82163587f9f61ea52c24f706335251"/><file name="Sell.php" hash="e2b5c21046de7dc4c1822c94072f9449"/><file name="SellerAccount.php" hash="f01153d60678c43470a873fa83d6ae20"/><file name="ServiceAbstract.php" hash="41b0fcbaff2a2df4baa925c58028a39b"/><file name="System.php" hash="ed174d4b1b1113fe512a6e0d5c4c5164"/></dir><file name=".DS_Store" hash="a92165c9b8b0612e564d72ef98d27b53"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Diglin_Ricento.xml" hash="0400f55950fe9fd6c4782d6a25096efd"/></dir></target><target name="mageweb"><dir name="js"><dir name="ricento"><file name="Countable.js" hash="dc66f2e57b917e39f897f254bcc8ec1b"/><file name="adminhtml.js" hash="ceb469bc46126e7e31e97d289300870b"/><dir name="livepipe-ui"><file name="livepipe.js" hash="d15a0747cdc197a7f7081d5be4f20d01"/><file name="progressbar.js" hash="2153c666af9b91c65111124665cb57f7"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ricento.xml" hash="47215c6d724221414017e391ec0f692b"/></dir><dir name="template"><dir name="ricento"><dir name="dashboard"><file name="account.phtml" hash="ad9d11463db769518a00fcf2d8f1bbb5"/><file name="banner.phtml" hash="9233cbde4520f4419ca87691906b48c5"/><file name="bestsellers.phtml" hash="c48282d7a83354f8054b20b751b9852e"/><file name="lifeturnover.phtml" hash="09c399dcd6aa68cb503c987a43aa3dce"/><file name="news.phtml" hash="799bab071c5a7b20b4c81f99824d3bc0"/><file name="toolbar.phtml" hash="49f2571e6545ca3cebfb027904381b56"/><dir name="turnover"><file name="graph.phtml" hash="96117aecbc0a074884357713482e5878"/></dir><file name="turnover.phtml" hash="0a85c63eef0863076504ee479c419e60"/></dir><file name="dashboard.phtml" hash="9f5db0d087823f15e6d428ae6dd773ec"/><file name="iframe.phtml" hash="e256fa4dec9eadf41f7c2b5f10ba48bd"/><dir name="js"><dir name="rules"><dir name="validate"><file name="paymentshipping.phtml" hash="8977da22325a8c1f469ce7eb4166f793"/></dir></dir><dir name="salesoptions"><dir name="validate"><file name="increment.phtml" hash="22d268c8498ad4ee3d6a18bdf42d2c26"/></dir></dir><dir name="sync"><file name="progress.phtml" hash="6e8c2dff5d024c7cb093b4df56f46ff3"/></dir></dir><file name="log.phtml" hash="1402eabd3eb946784c59c68a724738d9"/><dir name="notifications"><file name="configured.phtml" hash="f36530088576fdc4836a40012700f252"/><file name="expiration.phtml" hash="01d21a1804692ee9a83f9dd3f05d407b"/></dir><dir name="payment"><dir name="info"><file name="default.phtml" hash="73254e7af8ebd279f6f4156e88e8f465"/><dir name="pdf"><file name="default.phtml" hash="5ea160a594ac5569c0f32a46cd472e14"/></dir></dir></dir><dir name="products"><dir name="category"><file name="children.phtml" hash="bfe6d5d5ba7cb24f4a0f3344af224f0c"/><dir name="mapping"><file name="tree.phtml" hash="3dabf207a79d32b143e00b397c4a041b"/></dir><file name="mapping.phtml" hash="25edee745a8baddd81556292976ec368"/></dir><dir name="listing"><file name="confirmation.phtml" hash="4a33fc972a5ccb1088b3f631d88b053c"/><dir name="item"><dir name="edit"><file name="form.phtml" hash="15557d807e5aa6b5b34285729e04c3af"/></dir><file name="preview.phtml" hash="2d40dcc958496d49f8f2a72d96e37d91"/></dir></dir></dir><file name="stats.phtml" hash="a2d523de72ac055fe9b85f923d2e7910"/><file name="support.phtml" hash="421232ce2c120b8e0aa1f4828a228fc8"/><dir name="sync"><dir name="check"><file name="popup.phtml" hash="4acc891d7ae7cb4cb07bc51ced5b438b"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ricento"><dir name="payment"><dir name="info"><file name="default.phtml" hash="73254e7af8ebd279f6f4156e88e8f465"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="ricento"><dir name="css"><dir name="images"><file name="ajax-loader.gif" hash="73e57937304d89f251e7e540a24b095a"/><file name="arrow_sans_right_32.gif" hash="276b86bab75976c98e3c5202916d927a"/><file name="monotone_check_yes_ok.png" hash="b7b1d4c572e0c2ed10435a802549ae64"/><file name="ricardo_16x16.png" hash="5987591334d1b58f66ae4db2683fa8fd"/><file name="ricardo_32x32.png" hash="0635c69692c26a4bd4707a91336d9b3b"/><file name="settings_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><file name="window_maximize.png" hash="0f9c031e141822fed135270e34b128d5"/><file name="window_minimize.png" hash="62e6795471543a0eff14a07bf271d8d7"/></dir><file name="ricento.css" hash="8e7a0eddc9ee5855043f2da3915fcbc5"/></dir><dir name="images"><file name="KB.png" hash="187e953f8ebf9fe5829ec31427ff853b"/><file name="banner.png" hash="0b34711f9cdd44f07baef2b9b9536391"/><file name="contact.png" hash="85ed8d8113a897128ab1263e23b69dbb"/><file name="diglin.png" hash="cb24b7fec64fd8f906375d497b7e5e0f"/><file name="diglin@2x.png" hash="0e834d7839f61e789db16c028100b6ff"/><file name="github.png" hash="548d544d642e6afbba46dd2482f95af3"/><file name="online-support-48.png" hash="70f55fb3bc678875eaf53dfb214d7d3d"/><file name="ricardo.png" hash="21beeb511cf31d16ebc6b9d947806447"/><file name="ricardo@2x.png" hash="af83978f369def1e4e87fc06e4903c61"/><file name="settings-13-48.png" hash="3dc22c1da4f952687699e5fc23028232"/><file name="sinchronize-48.png" hash="15735cf3ca563303d9e981faba075750"/><file name="statistics-48.png" hash="38046c16959de9ee22b1679d4ddf3909"/><file name="view-details-48.png" hash="a8bbab2e728f1723e9e17dce5f939b22"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Diglin_Ricento.csv" hash="4721d10052e718654ed1926b5c28ff63"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="token_expiration.html" hash="d0214f1f7905f50328a1e13b0dd7a72d"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Diglin_Ricento.csv" hash="6a6582e2a367b0b775589836b8e08c3a"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="token_expiration.html" hash="995fb9dea103f6efffc9c392efa160b7"/></dir></dir></dir></dir><dir name="de_DE"><file name="Diglin_Ricento.csv" hash="9993d5900582640a60f497f07f1d4521"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/><file name="support.html" hash="6e381c94546829bfb963276e51cf731b"/><file name="token_expiration.html" hash="d0214f1f7905f50328a1e13b0dd7a72d"/></dir></dir></dir></dir><dir name="de_CH"><file name="Diglin_Ricento.csv" hash="9993d5900582640a60f497f07f1d4521"/><dir name="template"><dir name="email"><dir name="ricento"><file name="admin_message.html" hash="40225dc7f1b06dae985c230bc4f3d0b7"/><file name="private_message.html" hash="3b2ea2a457b176194d91aeb54a05bb47"/></dir></dir></dir></dir></target></contents>
|
| 228 |
<compatible/>
|
| 229 |
<dependencies><required><php><min>5.3.2</min><max>5.6.0</max></php></required></dependencies>
|
| 230 |
</package>
|
