Skip to content

Commit

Permalink
Merge pull request #10 from descom-es/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
llorensjj authored Oct 26, 2017
2 parents f38a588 + 15d92a9 commit f0a2c4d
Show file tree
Hide file tree
Showing 106 changed files with 28 additions and 12,998 deletions.
12 changes: 7 additions & 5 deletions descomsms.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
exit;
}

define('VERSION', '1.0.3');
define('VERSION', '1.0.4');
define('LATEST_VERSION_URL', 'https://www.descomsms.com/download/prestashop/latest.php');

class descomsms extends Module
Expand Down Expand Up @@ -42,10 +42,12 @@ public function install()
) {
return false;
} else {
$this->CreateTab('AdminDescomsms', 'Descom SMS', 0);
//$idParent = Tab::getIdFromClassName("SMSpubli");
//$this->CreateTab("Home", $this->l('Home'), $idParent);

if (version_compare(_PS_VERSION_, '1.7.0', '>=')) {
$id_parent = (int) Tab::getIdFromClassName('CONFIGURE');
$this->CreateTab('AdminDescomsms', 'Descom SMS', $id_parent);
} else {
$this->CreateTab('AdminDescomsms', 'Descom SMS', 0);
}
$this->InitConfigValues();
}
}
Expand Down
2 changes: 1 addition & 1 deletion libs/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"guzzlehttp/guzzle": "5.3.1",
"descom/php-sms": "^1.0"
"descom/sms-php": "^1.0"
}
}
8 changes: 4 additions & 4 deletions libs/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion libs/vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInite199b08ed532db2c5c0755c890833792::getLoader();
return ComposerAutoloaderInit31c22175a255482a24e9b916b3f6f90a::getLoader();
2 changes: 1 addition & 1 deletion libs/vendor/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
'Descom\\Sms\\' => array($vendorDir . '/descom/php-sms/src'),
'Descom\\Sms\\' => array($vendorDir . '/descom/sms-php/src'),
);
14 changes: 7 additions & 7 deletions libs/vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInite199b08ed532db2c5c0755c890833792
class ComposerAutoloaderInit31c22175a255482a24e9b916b3f6f90a
{
private static $loader;

Expand All @@ -19,15 +19,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInite199b08ed532db2c5c0755c890833792', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit31c22175a255482a24e9b916b3f6f90a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInite199b08ed532db2c5c0755c890833792', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit31c22175a255482a24e9b916b3f6f90a', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInite199b08ed532db2c5c0755c890833792::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit31c22175a255482a24e9b916b3f6f90a::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand All @@ -48,19 +48,19 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInite199b08ed532db2c5c0755c890833792::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit31c22175a255482a24e9b916b3f6f90a::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree199b08ed532db2c5c0755c890833792($fileIdentifier, $file);
composerRequire31c22175a255482a24e9b916b3f6f90a($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequiree199b08ed532db2c5c0755c890833792($fileIdentifier, $file)
function composerRequire31c22175a255482a24e9b916b3f6f90a($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
Expand Down
8 changes: 4 additions & 4 deletions libs/vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInite199b08ed532db2c5c0755c890833792
class ComposerStaticInit31c22175a255482a24e9b916b3f6f90a
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
Expand Down Expand Up @@ -46,15 +46,15 @@ class ComposerStaticInite199b08ed532db2c5c0755c890833792
),
'Descom\\Sms\\' =>
array (
0 => __DIR__ . '/..' . '/descom/php-sms/src',
0 => __DIR__ . '/..' . '/descom/sms-php/src',
),
);

public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite199b08ed532db2c5c0755c890833792::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite199b08ed532db2c5c0755c890833792::$prefixDirsPsr4;
$loader->prefixLengthsPsr4 = ComposerStaticInit31c22175a255482a24e9b916b3f6f90a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit31c22175a255482a24e9b916b3f6f90a::$prefixDirsPsr4;

}, null, ClassLoader::class);
}
Expand Down
6 changes: 3 additions & 3 deletions libs/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,17 @@
]
},
{
"name": "descom/php-sms",
"name": "descom/sms-php",
"version": "v1.0.10",
"version_normalized": "1.0.10.0",
"source": {
"type": "git",
"url": "https://github.com/descom-es/php-sms.git",
"url": "https://github.com/descom-es/sms-php.git",
"reference": "779cd0a04c74652dde5434641fc73887ae58ea2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/descom-es/php-sms/zipball/779cd0a04c74652dde5434641fc73887ae58ea2a",
"url": "https://api.github.com/repos/descom-es/sms-php/zipball/779cd0a04c74652dde5434641fc73887ae58ea2a",
"reference": "779cd0a04c74652dde5434641fc73887ae58ea2a",
"shasum": ""
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

27 changes: 0 additions & 27 deletions libs/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php

This file was deleted.

Loading

0 comments on commit f0a2c4d

Please sign in to comment.