Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 08:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for travis (#2669)

Browse Source
This commit is contained in:
David Bomba 2019-02-17 22:07:58 +11:00 committed by GitHub
parent eddb9adc73
commit 7b5028820d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/ClientController.php
View File

@ -66,7 +66,6 @@ class ClientController extends Controller
*/ */
public function index() public function index()
{ {
;
if(request('page')) if(request('page'))
return $this->clientDatatable->query(request(), $this->getCurrentCompanyId()); return $this->clientDatatable->query(request(), $this->getCurrentCompanyId());

2
app/Jobs/Client/StoreClient.php
View File

@ -40,5 +40,7 @@ class StoreClient
$client = $clientRepo->save($this->request, $this->client); $client = $clientRepo->save($this->request, $this->client);
$contacts = $clientContactRepo->save($this->request->input('contacts'), $client); $contacts = $clientContactRepo->save($this->request->input('contacts'), $client);
return $client;
} }
} }

4
app/Jobs/Company/CreateCompany.php
View File

@ -2,11 +2,12 @@
namespace App\Jobs\Company; namespace App\Jobs\Company;
use App\DataMapper\CompanySettings;
use App\Events\UserSignedUp; use App\Events\UserSignedUp;
use App\Models\Company;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\Company;
class CreateCompany class CreateCompany
{ {
@ -43,6 +44,7 @@ class CreateCompany
$company->company_key = $this->createHash(); $company->company_key = $this->createHash();
$company->db = config('database.default'); $company->db = config('database.default');
$company->ip = request()->ip(); $company->ip = request()->ip();
$company->settings = CompanySettings::defaults();
$company->save(); $company->save();

4
app/Jobs/User/CreateUser.php
View File

@ -2,9 +2,10 @@
namespace App\Jobs\User; namespace App\Jobs\User;
use App\DataMapper\DefaultSettings;
use App\Events\User\UserCreated; use App\Events\User\UserCreated;
use App\Models\User;
use App\Models\CompanyUser; use App\Models\CompanyUser;
use App\Models\User;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -54,6 +55,7 @@ class CreateUser
'account_id' => $this->account->id, 'account_id' => $this->account->id,
'is_owner' => 1, 'is_owner' => 1,
'is_admin' => 1, 'is_admin' => 1,
'settings' => json_encode(DefaultSettings::userSettings()),
]); ]);
event(new UserCreated($user)); event(new UserCreated($user));

12
public/js/client_edit.js vendored
View File

@ -1802,12 +1802,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
return this.client.country_id; return this.client.country_id;
}, },
get: function get(value) { get: function get(value) {
var _this3 = this; var _this3 = this;
return this.countryArray.filter(function (obj) { return this.countryArray.filter(function (obj) {
return obj.id === _this3.client.country_id; return obj.id === _this3.client.country_id;
}); });
} }
} }
@ -2090,9 +2088,7 @@ exports = module.exports = __webpack_require__("./node_modules/css-loader/lib/cs
// module // module
exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n\n", ""]);
exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n", ""]);
// exports // exports
@ -4144,9 +4140,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var vue_1 = __importDefault(__webpack_require__("./node_modules/vue/dist/vue.common.js")); var vue_1 = __importDefault(__webpack_require__("./node_modules/vue/dist/vue.common.js"));
var vue_affix_1 = __webpack_require__("./node_modules/vue-affix/dist/vue-affix.min.js"); var vue_affix_1 = __webpack_require__("./node_modules/vue-affix/dist/vue-affix.min.js");
var VueScrollactive = __webpack_require__("./node_modules/vue-scrollactive/dist/vue-scrollactive.min.js"); var VueScrollactive = __webpack_require__("./node_modules/vue-scrollactive/dist/vue-scrollactive.min.js");
var vue_multiselect_1 = __importDefault(__webpack_require__("./node_modules/vue-multiselect/dist/vue-multiselect.min.js")); var vue_multiselect_1 = __importDefault(__webpack_require__("./node_modules/vue-multiselect/dist/vue-multiselect.min.js"));
vue_1.default.use(VueScrollactive); vue_1.default.use(VueScrollactive);
exports.default = { exports.default = {
components: { components: {
@ -4252,7 +4246,6 @@ exports.default = {
return vue_1.default.prototype.trans('texts.language_id'); return vue_1.default.prototype.trans('texts.language_id');
} }
} }
}; };
@ -6812,10 +6805,8 @@ var render = function() {
]) ])
]) ])
]) ])
] ]
) )
} }
var staticRenderFns = [] var staticRenderFns = []
render._withStripped = true render._withStripped = true
@ -7031,7 +7022,6 @@ var render = function() {
]), ]),
_vm._v(" "), _vm._v(" "),
!!_vm.company.settings.custom_client_contact_label1 !!_vm.company.settings.custom_client_contact_label1
? _c("div", { staticClass: "form-group row" }, [ ? _c("div", { staticClass: "form-group row" }, [
_c( _c(
"label", "label",

902
public/js/client_edit.min.js vendored
View File

File diff suppressed because it is too large Load Diff

24
public/mix-manifest.json
View File

@ -1,17 +1,17 @@
{ {
"/js/client_list.js": "/js/client_list.js?id=b6d333a76dc9bfedb99c", "/js/client_list.js": "/js/client_list.js?id=88d90244e855305bcfff",
"/js/client_edit.js": "/js/client_edit.js?id=c6857e60873f45d76585", "/js/client_edit.js": "/js/client_edit.js?id=009c9400b6521af01875",
"/js/client_show.js": "/js/client_show.js?id=c5c15fa08d83dd664bae", "/js/client_show.js": "/js/client_show.js?id=be7307363fb5779cdb24",
"/js/client_create.js": "/js/client_create.js?id=8877c717377866cb12ba", "/js/client_create.js": "/js/client_create.js?id=ca114ece0bbf0eb79d38",
"/js/localization.js": "/js/localization.js?id=ae81449ec88ae5c9c0a4", "/js/localization.js": "/js/localization.js?id=85f6f7672f9cf65d9745",
"/js/coreui.js": "/js/coreui.js?id=713ed1bcd7251ec4523b", "/js/coreui.js": "/js/coreui.js?id=9cfda6dd6df9aaeea844",
"/js/ninja.min.js": "/js/ninja.min.js?id=d41d8cd98f00b204e980", "/js/ninja.min.js": "/js/ninja.min.js?id=d41d8cd98f00b204e980",
"/js/coreui.min.js": "/js/coreui.min.js?id=713ed1bcd7251ec4523b", "/js/coreui.min.js": "/js/coreui.min.js?id=9cfda6dd6df9aaeea844",
"/js/client_show.min.js": "/js/client_show.min.js?id=c5c15fa08d83dd664bae", "/js/client_show.min.js": "/js/client_show.min.js?id=be7307363fb5779cdb24",
"/js/client_edit.min.js": "/js/client_edit.min.js?id=c6857e60873f45d76585", "/js/client_edit.min.js": "/js/client_edit.min.js?id=009c9400b6521af01875",
"/js/client_create.min.js": "/js/client_create.min.js?id=8877c717377866cb12ba", "/js/client_create.min.js": "/js/client_create.min.js?id=ca114ece0bbf0eb79d38",
"/js/client_list.min.js": "/js/client_list.min.js?id=b6d333a76dc9bfedb99c", "/js/client_list.min.js": "/js/client_list.min.js?id=88d90244e855305bcfff",
"/js/localization.min.js": "/js/localization.min.js?id=ae81449ec88ae5c9c0a4", "/js/localization.min.js": "/js/localization.min.js?id=85f6f7672f9cf65d9745",
"/css/ninja.css": "/css/ninja.css?id=28421bc494c5086ac359", "/css/ninja.css": "/css/ninja.css?id=28421bc494c5086ac359",
"/css/ninja.min.css": "/css/ninja.min.css?id=28421bc494c5086ac359" "/css/ninja.min.css": "/css/ninja.min.css?id=28421bc494c5086ac359"
} }

1
resources/views/signup/index.blade.php
View File

@ -119,6 +119,7 @@
</div> </div>
</div> </div>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.6/dist/vue.js"></script>
<script> <script>
new Vue({ new Vue({