Skip to content

Commit

Permalink
3.1.1
Browse files Browse the repository at this point in the history 
3.1.1
  • Loading branch information
@PhocaCz
PhocaCz committed Aug 13, 2018
1 parent e81492b commit 7ca9b65
Show file tree
Hide file tree
Showing 123 changed files with 3,218 additions and 571 deletions.
39 changes: 33 additions & 6 deletions config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
<option value="2">COM_PHOCACART_YES_2_DIGITS</option>
</field>
-->
<field name="rounding_calculation_total" type="list" default="2" label="COM_PHOCACART_FIELD_ROUNDING_TOTAL_AMOUNT_LABEL" description="COM_PHOCACART_FIELD_ROUNDING_TOTAL_AMOUNT_LABEL">
<field name="rounding_calculation_total" type="list" default="2" label="COM_PHOCACART_FIELD_ROUNDING_TOTAL_AMOUNT_LABEL" description="COM_PHOCACART_FIELD_ROUNDING_TOTAL_AMOUNT_DESC">
<option value="-1">COM_PHOCACART_NO</option>
<option value="0">COM_PHOCACART_YES_0_DIGITS</option>
<option value="1">COM_PHOCACART_YES_1_DIGITS</option>
Expand Down Expand Up @@ -692,6 +692,10 @@
<option value="3">COM_PHOCACART_IN_ORDER</option>
</field>


<field name="default_order_status" default="1" type="PhocacartOrderstatus" label="COM_PHOCACART_FIELD_DEFAULT_ORDER_STATUS_LABEL" description="COM_PHOCACART_FIELD_DEFAULT_ORDER_STATUS_DESC" >
</field>

<field name="phocahead11" type="phocahead" default="COM_PHOCACART_CONFIG_UNITS" label="" description=""/>


Expand Down Expand Up @@ -843,7 +847,7 @@
<!--
<field name="invoice_prefix" default="" size="4" type="text" label="COM_PHOCACART_FIELD_INVOICE_PREFIX_LABEL" description="COM_PHOCACART_FIELD_INVOICE_PREFIX_DESC"/>
<field name="invoice_number_format" default="{prefix}{orderdate}{orderid}" size="4" type="text" label="COM_PHOCACART_FIELD_INVOICE_NUMBER_FORMAT_LABEL" description="COM_PHOCACART_FIELD_INVOICE_NUMBER_FORMAT_DESC"/>
<field name="invoice_number_format" default="" size="4" type="text" label="COM_PHOCACART_FIELD_INVOICE_NUMBER_FORMAT_LABEL" description="COM_PHOCACART_FIELD_INVOICE_NUMBER_FORMAT_DESC"/>
<field name="invoice_number_chars" default="12" size="4" type="text" label="COM_PHOCACART_FIELD_INVOICE_NUMBER_LENGTH_LABEL" description="COM_PHOCACART_FIELD_INVOICE_NUMBER_LENGTH_DESC"/>-->

Expand Down Expand Up @@ -980,7 +984,7 @@
<option value="1">file_get_contents</option>
<option value="2">cUrl</option>
</field>
recaptcha_request_method


<field name="phocahead24" type="phocaheadexpert" default="COM_PHOCACART_ADVANCED_OPTIONS_EXPERTS_ONLY_LABEL" label="" description=""/>

Expand Down Expand Up @@ -1067,8 +1071,25 @@ recaptcha_request_method
<field name="statistics_order_status" type="PhocacartOrderstatus" default="-1" label="COM_PHOCACART_FIELD_STATISTICS_ORDER_STATUS_LABEL" description="COM_PHOCACART_FIELD_STATISTICS_ORDER_STATUS_DESC" multiple="true" />


<field name="phocahead27" type="phocahead" default="COM_PHOCACART_REPORT_OPTIONS_LABEL" label="" description=""/>

<field name="report_header" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_REPORT_HEADER_LABEL" description="COM_PHOCACART_FIELD_REPORT_HEADER_DESC" addfieldpath="/administrator/components/com_content/models/fields" />

<field name="report_display_tax" type="radio" class="btn-group btn-group-yesno" default="1" label="COM_PHOCACART_FIELD_REPORT_DISPLAY_TAX_LABEL" description="COM_PHOCACART_FIELD_REPORT_DISPLAY_TAX_DESC">
<option value="0">COM_PHOCACART_NO</option>
<option value="1">COM_PHOCACART_YES</option>
</field>

<field name="report_display_rounding" type="radio" class="btn-group btn-group-yesno" default="1" label="COM_PHOCACART_FIELD_REPORT_DISPLAY_ROUNDING_LABEL" description="COM_PHOCACART_FIELD_REPORT_DISPLAY_ROUNDING_DESC">
<option value="0">COM_PHOCACART_NO</option>
<option value="1">COM_PHOCACART_YES</option>
</field>

</fieldset>




<fieldset name="store" label="COM_PHOCACART_CONFIG_HEAD_STORE_LABEL">


Expand Down Expand Up @@ -1125,6 +1146,12 @@ recaptcha_request_method


<fieldset name="billing" label="COM_PHOCACART_CONFIG_HEAD_BILLING_LABEL">

<field name="bank_account_number" default="" size="18" type="text" label="COM_PHOCACART_FIELD_BANK_ACCOUNT_NUMBER_LABEL" description="COM_PHOCACART_FIELD_BANK_ACCOUNT_NUMBER_DESC"/>

<field name="iban" default="" size="18" type="text" label="COM_PHOCACART_FIELD_IBAN_LABEL" description="COM_PHOCACART_FIELD_IBAN_DESC"/>
<field name="bic_swift" default="" size="18" type="text" label="COM_PHOCACART_FIELD_BIC_SWIFT_LABEL" description="COM_PHOCACART_FIELD_BIC_SWIFT_DESC"/>


<field name="order_number_format" default="{prefix}{year}{orderid}{suffix}" size="18" type="text" label="COM_PHOCACART_FIELD_ORDER_NUMBER_FORMAT_LABEL" description="COM_PHOCACART_FIELD_ORDER_NUMBER_FORMAT_DESC"/>
<field name="order_number_prefix" default="" size="18" type="text" label="COM_PHOCACART_FIELD_ORDER_NUMBER_PREFIX_LABEL" description="COM_PHOCACART_FIELD_ORDER_NUMBER_PREFIX_DESC"/>
Expand Down Expand Up @@ -1156,9 +1183,9 @@ recaptcha_request_method
<field name="pdf_invoice_qr_code" default="" type="textarea" label="COM_PHOCACART_FIELD_PDF_INVOICE_QR_CODE_LABEL" description="COM_PHOCACART_FIELD_PDF_INVOICE_QR_CODE_DESC" />
<field name="pdf_invoice_signature_image" type="media" default="" directoryimg="1" label="COM_PHOCACART_FIELD_PDF_INVOICE_SIGNATURE_IMAGE_LABEL" description="COM_PHOCACART_FIELD_PDF_INVOICE_SIGNATURE_IMAGE_DESC" />

<field name="invoice_global_top_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_TOP_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_TOP_DESCRIPTION_LABEL" addfieldpath="/administrator/components/com_content/models/fields" />
<field name="invoice_global_middle_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_MIDDLE_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_MIDDLE_DESCRIPTION_LABEL" addfieldpath="/administrator/components/com_content/models/fields" />
<field name="invoice_global_bottom_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_BOTTOM_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_BOTTOM_DESCRIPTION_LABEL" addfieldpath="/administrator/components/com_content/models/fields" />
<field name="invoice_global_top_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_TOP_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_TOP_DESCRIPTION_DESC" addfieldpath="/administrator/components/com_content/models/fields" />
<field name="invoice_global_middle_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_MIDDLE_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_MIDDLE_DESCRIPTION_DESC" addfieldpath="/administrator/components/com_content/models/fields" />
<field name="invoice_global_bottom_desc" type="modal_article" select="true" new="true" edit="true" clear="true" class="inputbox" label="COM_PHOCACART_FIELD_INVOICE_GLOBAL_BOTTOM_DESCRIPTION_LABEL" description="COM_PHOCACART_FIELD_INVOICE_GLOBAL_BOTTOM_DESCRIPTION_DESC" addfieldpath="/administrator/components/com_content/models/fields" />

</fieldset>

Expand Down
18 changes: 18 additions & 0 deletions controllers/phocacartreports.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
/* @package Joomla
* @copyright Copyright (C) Open Source Matters. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* @extension Phoca Extension
* @copyright Copyright (C) Jan Pavelka www.phoca.cz
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
*/
defined('_JEXEC') or die();
require_once JPATH_COMPONENT.'/controllers/phocacartcommons.php';
class PhocaCartCpControllerPhocacartReports extends PhocaCartCpControllerPhocaCartCommons
{
public function &getModel($name = 'PhocaCartReport', $prefix = 'PhocaCartCpModel', $config = array()) {
$model = parent::getModel($name, $prefix, array('ignore_request' => true));
return $model;
}
}
?>
2 changes: 1 addition & 1 deletion extensions/components/components.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"Phoca","website":"https:\/\/www.phoca.cz","type":"components","extensions":[{"name":"Phoca Cart","image":"..\/media\/com_phocacart\/images\/administrator\/pc.png","link":"https:\/\/www.phoca.cz\/phocacart","version":"3.1.0","description":"E-commerce extension for Joomla! CMS","developer":"Phoca","developerlink":"https:\/\/www.phoca.cz\/","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/3.1.0\/com_phocacart_v3.1.0.zip","price":"","obtaintype":"1","type":"component","element":"com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""}]}
{"name":"Phoca","website":"https:\/\/www.phoca.cz","type":"components","extensions":[{"name":"Phoca Cart","image":"..\/media\/com_phocacart\/images\/administrator\/pc.png","link":"https:\/\/www.phoca.cz\/phocacart","version":"3.1.1","description":"E-commerce extension for Joomla! CMS","developer":"Phoca","developerlink":"https:\/\/www.phoca.cz\/","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/3.1.1\/com_phocacart_v3.1.1.zip","price":"","obtaintype":"1","type":"component","element":"com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""}]}
Binary file added extensions/languages/img/it.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion extensions/languages/languages.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"Phoca","website":"https:\/\/www.phoca.cz","type":"components","extensions":[{"name":"Brazilian (Portuguese)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/br.png","link":"","version":"3.0.0","description":"Brazilian language package","developer":"Daniel","developerlink":"","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/pt-BR.com_phocacart-j3.zip","price":"","obtaintype":"2","type":"file","element":"pt-BR.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Bulgarian (\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/bg.png","link":"http:\/\/www.cmsbg.info","version":"3.0.0","description":"Bulgarian language package","developer":"Stefan Ilivanov","developerlink":"http:\/\/www.cmsbg.info","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/bg-BG_cart_3.0.1_Work_in_progress.zip","price":"","obtaintype":"2","type":"file","element":"bg-BG.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Czech (\u010ce\u0161tina)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/cz.png","link":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","version":"3.0.0","description":"Czech language package","developer":"Bongovo.cz","developerlink":"https:\/\/www.bongovo.cz\/","download":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","price":"","obtaintype":"3","type":"file","element":"cs-CZ.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Finnish (suomen kieli)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/fi.png","link":"https:\/\/jokioistenmuseorautatie.fi\/en\/phoca-cart-finnish-translation","version":"3.0.2","description":"Finnish language package","developer":"JTe","developerlink":"https:\/\/jokioistenmuseorautatie.fi","download":"https:\/\/jokioistenmuseorautatie.fi\/en\/phoca-cart-finnish-translation","price":"","obtaintype":"2","type":"file","element":"fi-FI.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"German (Deutsch)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/de.png","link":"http:\/\/www.reisefotografien.eu\/downloads\/category\/203-phoca-cart-komponente","version":"3.0.3","description":"German language package","developer":"Reisefotografien.eu","developerlink":"http:\/\/www.reisefotografien.eu\/","download":"http:\/\/www.reisefotografien.eu\/downloads\/category\/203-phoca-cart-komponente","price":"","obtaintype":"2","type":"file","element":"de-DE.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Russian (\u0440\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/ru.png","link":"","version":"3.0.0","description":"Russian language package","developer":"Igor Fomin","developerlink":"http:\/\/www.scorpion.odessa.ua\/","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/ru_RU.com_phocacart-j3.zip","price":"","obtaintype":"2","type":"file","element":"ru-RU.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Slovak (sloven\u010dina)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/sk.png","link":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","version":"3.0.0","description":"Slovak language package","developer":"Bongovo.cz","developerlink":"https:\/\/www.bongovo.cz\/","download":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","price":"","obtaintype":"3","type":"file","element":"sk-SK.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Spanish (espa\u00f1ol)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/es.png","link":"","version":"3.0.0","description":"Spanish language package","developer":"redlo","developerlink":"","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/es-ES.com_phocacart-j3_v2.zip","price":"","obtaintype":"2","type":"file","element":"es-ES.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""}]}
{"name":"Phoca","website":"https:\/\/www.phoca.cz","type":"components","extensions":[{"name":"Brazilian (Portuguese)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/br.png","link":"","version":"3.0.0","description":"Brazilian language package","developer":"Daniel","developerlink":"","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/pt-BR.com_phocacart-j3.zip","price":"","obtaintype":"2","type":"file","element":"pt-BR.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Bulgarian (\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/bg.png","link":"http:\/\/www.cmsbg.info","version":"3.0.0","description":"Bulgarian language package","developer":"Stefan Ilivanov","developerlink":"http:\/\/www.cmsbg.info","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/bg-BG_cart_3.0.1_Work_in_progress.zip","price":"","obtaintype":"2","type":"file","element":"bg-BG.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Czech (\u010ce\u0161tina)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/cz.png","link":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","version":"3.0.0","description":"Czech language package","developer":"Bongovo.cz","developerlink":"https:\/\/www.bongovo.cz\/","download":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","price":"","obtaintype":"3","type":"file","element":"cs-CZ.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Finnish (suomen kieli)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/fi.png","link":"https:\/\/jokioistenmuseorautatie.fi\/en\/phoca-cart-finnish-translation","version":"3.0.2","description":"Finnish language package","developer":"JTe","developerlink":"https:\/\/jokioistenmuseorautatie.fi","download":"https:\/\/jokioistenmuseorautatie.fi\/en\/phoca-cart-finnish-translation","price":"","obtaintype":"2","type":"file","element":"fi-FI.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"German (Deutsch)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/de.png","link":"http:\/\/www.reisefotografien.eu\/downloads\/category\/203-phoca-cart-komponente","version":"3.0.3","description":"German language package","developer":"Reisefotografien.eu","developerlink":"http:\/\/www.reisefotografien.eu\/","download":"http:\/\/www.reisefotografien.eu\/downloads\/category\/203-phoca-cart-komponente","price":"","obtaintype":"2","type":"file","element":"de-DE.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Italian (Italiano)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/it.png","link":"","version":"3.0.0","description":"Italian language package","developer":"Alessandro","developerlink":"","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/it-IT.com_phocacart-j3.zip","price":"","obtaintype":"2","type":"file","element":"it-IT.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Russian (\u0440\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/ru.png","link":"","version":"3.0.0","description":"Russian language package","developer":"Igor Fomin","developerlink":"http:\/\/www.scorpion.odessa.ua\/","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/ru_RU.com_phocacart-j3.zip","price":"","obtaintype":"2","type":"file","element":"ru-RU.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Slovak (sloven\u010dina)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/sk.png","link":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","version":"3.0.0","description":"Slovak language package","developer":"Bongovo.cz","developerlink":"https:\/\/www.bongovo.cz\/","download":"https:\/\/www.bongovo.cz\/ke-stazeni\/category\/131-phoca-cart","price":"","obtaintype":"3","type":"file","element":"sk-SK.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""},{"name":"Spanish (espa\u00f1ol)","image":"https:\/\/raw.githubusercontent.com\/PhocaCz\/PhocaCart\/master\/extensions\/languages\/img\/es.png","link":"","version":"3.0.0","description":"Spanish language package","developer":"redlo","developerlink":"","download":"https:\/\/github.com\/PhocaCz\/PhocaCart\/releases\/download\/languages\/es-ES.com_phocacart-j3_v2.zip","price":"","obtaintype":"2","type":"file","element":"es-ES.com_phocacart","folder":"","compatibility":"3","added":"","updated":"","featured":""}]}
Loading

0 comments on commit 7ca9b65

Please sign in to comment.