mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-28 12:11:08 -04:00
Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling
This commit is contained in:
@ -1167,7 +1167,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function handle($input, $output = null){
|
public static function handle($input, $output = null){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
return \Laraspace\Console\Kernel::handle($input, $output);
|
return \Crater\Console\Kernel::handle($input, $output);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1180,7 +1180,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function terminate($input, $status){
|
public static function terminate($input, $status){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
\Laraspace\Console\Kernel::terminate($input, $status);
|
\Crater\Console\Kernel::terminate($input, $status);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1193,7 +1193,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function command($signature, $callback){
|
public static function command($signature, $callback){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
return \Laraspace\Console\Kernel::command($signature, $callback);
|
return \Crater\Console\Kernel::command($signature, $callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1205,7 +1205,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function registerCommand($command){
|
public static function registerCommand($command){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
\Laraspace\Console\Kernel::registerCommand($command);
|
\Crater\Console\Kernel::registerCommand($command);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1219,7 +1219,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function call($command, $parameters = array(), $outputBuffer = null){
|
public static function call($command, $parameters = array(), $outputBuffer = null){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
return \Laraspace\Console\Kernel::call($command, $parameters, $outputBuffer);
|
return \Crater\Console\Kernel::call($command, $parameters, $outputBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1232,7 +1232,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function queue($command, $parameters = array()){
|
public static function queue($command, $parameters = array()){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
\Laraspace\Console\Kernel::queue($command, $parameters);
|
\Crater\Console\Kernel::queue($command, $parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1243,7 +1243,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function all(){
|
public static function all(){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
return \Laraspace\Console\Kernel::all();
|
return \Crater\Console\Kernel::all();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1254,7 +1254,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function output(){
|
public static function output(){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
return \Laraspace\Console\Kernel::output();
|
return \Crater\Console\Kernel::output();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1265,7 +1265,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function bootstrap(){
|
public static function bootstrap(){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
\Laraspace\Console\Kernel::bootstrap();
|
\Crater\Console\Kernel::bootstrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1277,7 +1277,7 @@ namespace {
|
|||||||
*/
|
*/
|
||||||
public static function setArtisan($artisan){
|
public static function setArtisan($artisan){
|
||||||
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
//Method inherited from \Illuminate\Foundation\Console\Kernel
|
||||||
\Laraspace\Console\Kernel::setArtisan($artisan);
|
\Crater\Console\Kernel::setArtisan($artisan);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1424,7 +1424,7 @@ namespace {
|
|||||||
/**
|
/**
|
||||||
* Get the currently authenticated user.
|
* Get the currently authenticated user.
|
||||||
*
|
*
|
||||||
* @return \Laraspace\User|null
|
* @return \Crater\User|null
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
public static function user(){
|
public static function user(){
|
||||||
@ -1456,7 +1456,7 @@ namespace {
|
|||||||
* Log the given user ID into the application without sessions or cookies.
|
* Log the given user ID into the application without sessions or cookies.
|
||||||
*
|
*
|
||||||
* @param mixed $id
|
* @param mixed $id
|
||||||
* @return \Laraspace\User|false
|
* @return \Crater\User|false
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
public static function onceUsingId($id){
|
public static function onceUsingId($id){
|
||||||
@ -1515,7 +1515,7 @@ namespace {
|
|||||||
*
|
*
|
||||||
* @param mixed $id
|
* @param mixed $id
|
||||||
* @param bool $remember
|
* @param bool $remember
|
||||||
* @return \Laraspace\User|false
|
* @return \Crater\User|false
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
public static function loginUsingId($id, $remember = false){
|
public static function loginUsingId($id, $remember = false){
|
||||||
@ -1558,7 +1558,7 @@ namespace {
|
|||||||
/**
|
/**
|
||||||
* Get the last user we attempted to authenticate.
|
* Get the last user we attempted to authenticate.
|
||||||
*
|
*
|
||||||
* @return \Laraspace\User
|
* @return \Crater\User
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
public static function getLastAttempted(){
|
public static function getLastAttempted(){
|
||||||
@ -1672,7 +1672,7 @@ namespace {
|
|||||||
/**
|
/**
|
||||||
* Return the currently cached user.
|
* Return the currently cached user.
|
||||||
*
|
*
|
||||||
* @return \Laraspace\User|null
|
* @return \Crater\User|null
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
public static function getUser(){
|
public static function getUser(){
|
||||||
@ -1714,7 +1714,7 @@ namespace {
|
|||||||
/**
|
/**
|
||||||
* Determine if the current user is authenticated.
|
* Determine if the current user is authenticated.
|
||||||
*
|
*
|
||||||
* @return \Laraspace\User
|
* @return \Crater\User
|
||||||
* @throws \Illuminate\Auth\AuthenticationException
|
* @throws \Illuminate\Auth\AuthenticationException
|
||||||
* @static
|
* @static
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Country;
|
use Crater\Country;
|
||||||
use Laraspace\State;
|
use Crater\State;
|
||||||
use Laraspace\City;
|
use Crater\City;
|
||||||
|
|
||||||
class Address extends Model
|
class Address extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\State;
|
use Crater\State;
|
||||||
use Laraspace\Country;
|
use Crater\Country;
|
||||||
|
|
||||||
class City extends Model
|
class City extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
|
|
||||||
class CompanySetting extends Model
|
class CompanySetting extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Console\Commands;
|
namespace Crater\Console\Commands;
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
|
|
||||||
class CheckEstimateStatus extends Command
|
class CheckEstimateStatus extends Command
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Console\Commands;
|
namespace Crater\Console\Commands;
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
|
|
||||||
class CheckInvoiceStatus extends Command
|
class CheckInvoiceStatus extends Command
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Console;
|
namespace Crater\Console;
|
||||||
|
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\State;
|
use Crater\State;
|
||||||
use Laraspace\Country;
|
use Crater\Country;
|
||||||
|
|
||||||
class Country extends Model
|
class Country extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
class Estimate extends Model
|
class Estimate extends Model
|
||||||
@ -79,12 +79,12 @@ class Estimate extends Model
|
|||||||
|
|
||||||
public function items()
|
public function items()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Laraspace\EstimateItem');
|
return $this->hasMany('Crater\EstimateItem');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Laraspace\User');
|
return $this->belongsTo('Crater\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function taxes()
|
public function taxes()
|
||||||
@ -94,7 +94,7 @@ class Estimate extends Model
|
|||||||
|
|
||||||
public function estimateTemplate()
|
public function estimateTemplate()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Laraspace\EstimateTemplate');
|
return $this->belongsTo('Crater\EstimateTemplate');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getEstimateNumAttribute()
|
public function getEstimateNumAttribute()
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
|
|
||||||
class EstimateTemplate extends Model
|
class EstimateTemplate extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Events;
|
namespace Crater\Events;
|
||||||
|
|
||||||
use Illuminate\Broadcasting\Channel;
|
use Illuminate\Broadcasting\Channel;
|
||||||
use Illuminate\Broadcasting\InteractsWithSockets;
|
use Illuminate\Broadcasting\InteractsWithSockets;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Exceptions;
|
namespace Crater\Exceptions;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
||||||
use Laraspace\ExpenseCategory;
|
use Crater\ExpenseCategory;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
class ExpenseCategory extends Model
|
class ExpenseCategory extends Model
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers\Auth;
|
namespace Crater\Http\Controllers\Auth;
|
||||||
|
|
||||||
use Laraspace\Proxy\HttpKernelProxy;
|
use Crater\Proxy\HttpKernelProxy;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
use Illuminate\Foundation\Auth\ThrottlesLogins;
|
use Illuminate\Foundation\Auth\ThrottlesLogins;
|
||||||
use Validator;
|
use Validator;
|
||||||
use Hash;
|
use Hash;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Auth;
|
use Auth;
|
||||||
use Laraspace\Http\Controllers\Controller;
|
use Crater\Http\Controllers\Controller;
|
||||||
|
|
||||||
class AccessTokensController extends Controller
|
class AccessTokensController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers\Auth;
|
namespace Crater\Http\Controllers\Auth;
|
||||||
|
|
||||||
use Laraspace\Http\Controllers\Controller;
|
use Crater\Http\Controllers\Controller;
|
||||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers\Auth;
|
namespace Crater\Http\Controllers\Auth;
|
||||||
|
|
||||||
use Laraspace\Http\Controllers\Controller;
|
use Crater\Http\Controllers\Controller;
|
||||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
|||||||
@ -1,22 +1,22 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\Address;
|
use Crater\Address;
|
||||||
use Laraspace\Http\Requests\SettingRequest;
|
use Crater\Http\Requests\SettingRequest;
|
||||||
use Laraspace\Http\Requests\SettingKeyRequest;
|
use Crater\Http\Requests\SettingKeyRequest;
|
||||||
use Laraspace\Http\Requests\ProfileRequest;
|
use Crater\Http\Requests\ProfileRequest;
|
||||||
use Laraspace\Http\Requests\CompanyRequest;
|
use Crater\Http\Requests\CompanyRequest;
|
||||||
use Laraspace\Http\Requests\CompanySettingRequest;
|
use Crater\Http\Requests\CompanySettingRequest;
|
||||||
use Laraspace\Http\Requests\NotificationSettingsRequest;
|
use Crater\Http\Requests\NotificationSettingsRequest;
|
||||||
use Laraspace\Space\CurrencyFormatter;
|
use Crater\Space\CurrencyFormatter;
|
||||||
use Laraspace\Space\DateFormatter;
|
use Crater\Space\DateFormatter;
|
||||||
use Laraspace\Space\TimeZones;
|
use Crater\Space\TimeZones;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
|
|
||||||
class CompanyController extends Controller
|
class CompanyController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||||
use Illuminate\Routing\Controller as BaseController;
|
use Illuminate\Routing\Controller as BaseController;
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Laraspace\Conversation;
|
use Crater\Conversation;
|
||||||
use Laraspace\Group;
|
use Crater\Group;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\Notifications\CustomerAdded;
|
use Crater\Notifications\CustomerAdded;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Address;
|
use Crater\Address;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class CustomersController extends Controller
|
class CustomersController extends Controller
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Laraspace\Payment;
|
use Crater\Payment;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class DashboardController extends Controller
|
class DashboardController extends Controller
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Validator;
|
use Validator;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Space\EnvironmentManager;
|
use Crater\Space\EnvironmentManager;
|
||||||
use Laraspace\Http\Requests\DatabaseEnvironmentRequest;
|
use Crater\Http\Requests\DatabaseEnvironmentRequest;
|
||||||
use Laraspace\Http\Requests\MailEnvironmentRequest;
|
use Crater\Http\Requests\MailEnvironmentRequest;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
use Laraspace\EstimateItem;
|
use Crater\EstimateItem;
|
||||||
use Laraspace\EstimateTemplate;
|
use Crater\EstimateTemplate;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Laraspace\Http\Requests\EstimatesRequest;
|
use Crater\Http\Requests\EstimatesRequest;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Validator;
|
use Validator;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Mail\EstimatePdf;
|
use Crater\Mail\EstimatePdf;
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
|
|
||||||
class EstimatesController extends Controller
|
class EstimatesController extends Controller
|
||||||
{
|
{
|
||||||
@ -306,8 +306,6 @@ class EstimatesController extends Controller
|
|||||||
public function sendEstimate(Request $request)
|
public function sendEstimate(Request $request)
|
||||||
{
|
{
|
||||||
$estimate = Estimate::findOrFail($request->id);
|
$estimate = Estimate::findOrFail($request->id);
|
||||||
$estimate->status = Estimate::STATUS_SENT;
|
|
||||||
$estimate->save();
|
|
||||||
|
|
||||||
$data['estimate'] = $estimate->toArray();
|
$data['estimate'] = $estimate->toArray();
|
||||||
$userId = $data['estimate']['user_id'];
|
$userId = $data['estimate']['user_id'];
|
||||||
@ -330,6 +328,11 @@ class EstimatesController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($estimate->status == Estimate::STATUS_DRAFT) {
|
||||||
|
$estimate->status = Estimate::STATUS_SENT;
|
||||||
|
$estimate->save();
|
||||||
|
}
|
||||||
|
|
||||||
\Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
|
\Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Laraspace\ExpenseCategory;
|
use Crater\ExpenseCategory;
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Http\Requests\ExpenseCategoryRequest;
|
use Crater\Http\Requests\ExpenseCategoryRequest;
|
||||||
|
|
||||||
class ExpenseCategoryController extends Controller
|
class ExpenseCategoryController extends Controller
|
||||||
{
|
{
|
||||||
@ -56,7 +56,7 @@ class ExpenseCategoryController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\ExpenseCategory $ExpenseCategory
|
* @param \Crater\ExpenseCategory $ExpenseCategory
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function show(ExpenseCategory $ExpenseCategory)
|
public function show(ExpenseCategory $ExpenseCategory)
|
||||||
@ -67,7 +67,7 @@ class ExpenseCategoryController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Show the form for editing the specified resource.
|
* Show the form for editing the specified resource.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\ExpensesCategory $ExpensesCategory
|
* @param \Crater\ExpensesCategory $ExpensesCategory
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function edit($id)
|
public function edit($id)
|
||||||
@ -83,7 +83,7 @@ class ExpenseCategoryController extends Controller
|
|||||||
* Update the specified resource in storage.
|
* Update the specified resource in storage.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param \Laraspace\ExpenseCategory $ExpenseCategory
|
* @param \Crater\ExpenseCategory $ExpenseCategory
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function update(ExpenseCategoryRequest $request, $id)
|
public function update(ExpenseCategoryRequest $request, $id)
|
||||||
@ -102,7 +102,7 @@ class ExpenseCategoryController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Remove the specified resource from storage.
|
* Remove the specified resource from storage.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\ExpensesCategory $expensesCategory
|
* @param \Crater\ExpensesCategory $expensesCategory
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function destroy($id)
|
public function destroy($id)
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\ExpenseCategory;
|
use Crater\ExpenseCategory;
|
||||||
use Laraspace\Http\Requests\ExpenseRequest;
|
use Crater\Http\Requests\ExpenseRequest;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Intervention\Image\Facades\Image;
|
use Intervention\Image\Facades\Image;
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ class ExpensesController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\Expense $expense
|
* @param \Crater\Expense $expense
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function show(Expense $expense)
|
public function show(Expense $expense)
|
||||||
@ -121,7 +121,7 @@ class ExpensesController extends Controller
|
|||||||
* Update the specified resource in storage.
|
* Update the specified resource in storage.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param \Laraspace\Expense $expense
|
* @param \Crater\Expense $expense
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function update(ExpenseRequest $request, Expense $expense)
|
public function update(ExpenseRequest $request, Expense $expense)
|
||||||
@ -149,7 +149,7 @@ class ExpensesController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Remove the specified resource from storage.
|
* Remove the specified resource from storage.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\Expense $expense
|
* @param \Crater\Expense $expense
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function destroy(Expense $expense)
|
public function destroy(Expense $expense)
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Payment;
|
use Crater\Payment;
|
||||||
use Laraspace\PdfSetting;
|
use Crater\PdfSetting;
|
||||||
use PDF;
|
use PDF;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\InvoiceTemplate;
|
use Crater\InvoiceTemplate;
|
||||||
use Laraspace\EstimateTemplate;
|
use Crater\EstimateTemplate;
|
||||||
use Auth;
|
use Auth;
|
||||||
use Laraspace\Mail\EstimateViewed;
|
use Crater\Mail\EstimateViewed;
|
||||||
use Laraspace\Mail\InvoiceViewed;
|
use Crater\Mail\InvoiceViewed;
|
||||||
|
|
||||||
class FrontendController extends Controller
|
class FrontendController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\InvoiceTemplate;
|
use Crater\InvoiceTemplate;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\InvoiceItem;
|
use Crater\InvoiceItem;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Laraspace\Mail\invoicePdf;
|
use Crater\Mail\invoicePdf;
|
||||||
use function MongoDB\BSON\toJSON;
|
use function MongoDB\BSON\toJSON;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Mailgun\Mailgun;
|
use Mailgun\Mailgun;
|
||||||
use PDF;
|
use PDF;
|
||||||
use Validator;
|
use Validator;
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
|
|
||||||
class InvoicesController extends Controller
|
class InvoicesController extends Controller
|
||||||
{
|
{
|
||||||
@ -371,12 +371,6 @@ class InvoicesController extends Controller
|
|||||||
{
|
{
|
||||||
$invoice = Invoice::findOrFail($request->id);
|
$invoice = Invoice::findOrFail($request->id);
|
||||||
|
|
||||||
if ($invoice->status == Invoice::STATUS_DRAFT) {
|
|
||||||
$invoice->status = Invoice::STATUS_SENT;
|
|
||||||
$invoice->sent = true;
|
|
||||||
$invoice->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$data['invoice'] = $invoice->toArray();
|
$data['invoice'] = $invoice->toArray();
|
||||||
$userId = $data['invoice']['user_id'];
|
$userId = $data['invoice']['user_id'];
|
||||||
$data['user'] = User::find($userId)->toArray();
|
$data['user'] = User::find($userId)->toArray();
|
||||||
@ -398,6 +392,12 @@ class InvoicesController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($invoice->status == Invoice::STATUS_DRAFT) {
|
||||||
|
$invoice->status = Invoice::STATUS_SENT;
|
||||||
|
$invoice->sent = true;
|
||||||
|
$invoice->save();
|
||||||
|
}
|
||||||
|
|
||||||
\Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
|
\Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
|
|
||||||
class ItemsController extends Controller
|
class ItemsController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Country;
|
use Crater\Country;
|
||||||
use Laraspace\State;
|
use Crater\State;
|
||||||
use Laraspace\City;
|
use Crater\City;
|
||||||
|
|
||||||
class LocationController extends Controller
|
class LocationController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\Address;
|
use Crater\Address;
|
||||||
use Laraspace\Http\Requests\ProfileRequest;
|
use Crater\Http\Requests\ProfileRequest;
|
||||||
use Laraspace\Http\Requests\CompanyRequest;
|
use Crater\Http\Requests\CompanyRequest;
|
||||||
use Laraspace\Http\Requests\CompanySettingRequest;
|
use Crater\Http\Requests\CompanySettingRequest;
|
||||||
use Laraspace\Space\DateFormatter;
|
use Crater\Space\DateFormatter;
|
||||||
use Laraspace\Space\TimeZones;
|
use Crater\Space\TimeZones;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Payment;
|
use Crater\Payment;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use function MongoDB\BSON\toJSON;
|
use function MongoDB\BSON\toJSON;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Http\Requests\PaymentRequest;
|
use Crater\Http\Requests\PaymentRequest;
|
||||||
|
|
||||||
class PaymentController extends Controller
|
class PaymentController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Laraspace\Space\PermissionsChecker;
|
use Crater\Space\PermissionsChecker;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
class PermissionsController extends Controller
|
class PermissionsController extends Controller
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\InvoiceItem;
|
use Crater\InvoiceItem;
|
||||||
use Laraspace\Expense;
|
use Crater\Expense;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
use PDF;
|
use PDF;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Laraspace\Space\RequirementsChecker;
|
use Crater\Space\RequirementsChecker;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
class RequirementsController extends Controller
|
class RequirementsController extends Controller
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
class SettingsController extends Controller
|
class SettingsController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Http\Requests\TaxTypeRequest;
|
use Crater\Http\Requests\TaxTypeRequest;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class TaxTypeController extends Controller
|
class TaxTypeController extends Controller
|
||||||
@ -60,7 +60,7 @@ class TaxTypeController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\TaxType $taxType
|
* @param \Crater\TaxType $taxType
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function show(TaxType $taxType)
|
public function show(TaxType $taxType)
|
||||||
@ -71,7 +71,7 @@ class TaxTypeController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Show the form for editing the specified resource.
|
* Show the form for editing the specified resource.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\TaxType $taxType
|
* @param \Crater\TaxType $taxType
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function edit(TaxType $taxType)
|
public function edit(TaxType $taxType)
|
||||||
@ -85,7 +85,7 @@ class TaxTypeController extends Controller
|
|||||||
* Update the specified resource in storage.
|
* Update the specified resource in storage.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param \Laraspace\TaxType $taxType
|
* @param \Crater\TaxType $taxType
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function update(TaxTypeRequest $request, TaxType $taxType)
|
public function update(TaxTypeRequest $request, TaxType $taxType)
|
||||||
@ -107,7 +107,7 @@ class TaxTypeController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Remove the specified resource from storage.
|
* Remove the specified resource from storage.
|
||||||
*
|
*
|
||||||
* @param \Laraspace\TaxType $taxType
|
* @param \Crater\TaxType $taxType
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function destroy(TaxType $taxType)
|
public function destroy(TaxType $taxType)
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Space\Updater;
|
use Crater\Space\Updater;
|
||||||
use Laraspace\Space\SiteApi;
|
use Crater\Space\SiteApi;
|
||||||
|
|
||||||
class UpdateController extends Controller
|
class UpdateController extends Controller
|
||||||
{
|
{
|
||||||
@ -12,7 +12,7 @@ class UpdateController extends Controller
|
|||||||
{
|
{
|
||||||
set_time_limit(600); // 10 minutes
|
set_time_limit(600); // 10 minutes
|
||||||
|
|
||||||
$json = Updater::update($request->installed, $request->version);
|
$json = Updater::update($request->installed, $request->version, $request->isMinor);
|
||||||
|
|
||||||
return response()->json($json);
|
return response()->json($json);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Controllers;
|
namespace Crater\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Http\Requests;
|
use Crater\Http\Requests;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use DB;
|
use DB;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Auth;
|
use Auth;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
|
|
||||||
class UsersController extends Controller
|
class UsersController extends Controller
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http;
|
namespace Crater\Http;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
||||||
use Laraspace\Http\Middleware\AdminMiddleware;
|
use Crater\Http\Middleware\AdminMiddleware;
|
||||||
|
|
||||||
class Kernel extends HttpKernel
|
class Kernel extends HttpKernel
|
||||||
{
|
{
|
||||||
@ -16,10 +16,10 @@ class Kernel extends HttpKernel
|
|||||||
protected $middleware = [
|
protected $middleware = [
|
||||||
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
|
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
|
||||||
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
|
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
|
||||||
\Laraspace\Http\Middleware\TrimStrings::class,
|
\Crater\Http\Middleware\TrimStrings::class,
|
||||||
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
||||||
\Laraspace\Http\Middleware\TrustProxies::class,
|
\Crater\Http\Middleware\TrustProxies::class,
|
||||||
\Laraspace\Http\Middleware\ConfigMiddleware::class,
|
\Crater\Http\Middleware\ConfigMiddleware::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -29,11 +29,11 @@ class Kernel extends HttpKernel
|
|||||||
*/
|
*/
|
||||||
protected $middlewareGroups = [
|
protected $middlewareGroups = [
|
||||||
'web' => [
|
'web' => [
|
||||||
\Laraspace\Http\Middleware\EncryptCookies::class,
|
\Crater\Http\Middleware\EncryptCookies::class,
|
||||||
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
||||||
\Illuminate\Session\Middleware\StartSession::class,
|
\Illuminate\Session\Middleware\StartSession::class,
|
||||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||||
\Laraspace\Http\Middleware\VerifyCsrfToken::class,
|
\Crater\Http\Middleware\VerifyCsrfToken::class,
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
@ -55,12 +55,12 @@ class Kernel extends HttpKernel
|
|||||||
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
||||||
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
|
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
'can' => \Illuminate\Auth\Middleware\Authorize::class,
|
'can' => \Illuminate\Auth\Middleware\Authorize::class,
|
||||||
'guest' => \Laraspace\Http\Middleware\RedirectIfAuthenticated::class,
|
'guest' => \Crater\Http\Middleware\RedirectIfAuthenticated::class,
|
||||||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||||
'admin' => AdminMiddleware::class,
|
'admin' => AdminMiddleware::class,
|
||||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||||
'install' => \Laraspace\Http\Middleware\InstallationMiddleware::class,
|
'install' => \Crater\Http\Middleware\InstallationMiddleware::class,
|
||||||
'redirect-if-installed' => \Laraspace\Http\Middleware\RedirectIfInstalled::class,
|
'redirect-if-installed' => \Crater\Http\Middleware\RedirectIfInstalled::class,
|
||||||
];
|
];
|
||||||
/**
|
/**
|
||||||
* The priority-sorted list of middleware.
|
* The priority-sorted list of middleware.
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Auth;
|
use Auth;
|
||||||
use Closure;
|
use Closure;
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
|
|
||||||
class ConfigMiddleware
|
class ConfigMiddleware
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
|
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
class InstallationMiddleware
|
class InstallationMiddleware
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
class RedirectIfInstalled
|
class RedirectIfInstalled
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
|
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Fideloper\Proxy\TrustProxies as Middleware;
|
use Fideloper\Proxy\TrustProxies as Middleware;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Middleware;
|
namespace Crater\Http\Middleware;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
|
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
|
|
||||||
class ProfileRequest extends FormRequest
|
class ProfileRequest extends FormRequest
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Http\Requests;
|
namespace Crater\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\InvoiceTemplate;
|
use Crater\InvoiceTemplate;
|
||||||
use Laraspace\Payment;
|
use Crater\Payment;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ class Invoice extends Model
|
|||||||
|
|
||||||
public function items()
|
public function items()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Laraspace\InvoiceItem');
|
return $this->hasMany('Crater\InvoiceItem');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function taxes()
|
public function taxes()
|
||||||
@ -105,7 +105,7 @@ class Invoice extends Model
|
|||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Laraspace\User');
|
return $this->belongsTo('Crater\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function invoiceTemplate()
|
public function invoiceTemplate()
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
|
|
||||||
class InvoiceTemplate extends Model
|
class InvoiceTemplate extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\InvoiceItem;
|
use Crater\InvoiceItem;
|
||||||
use Laraspace\EstimateItem;
|
use Crater\EstimateItem;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
class Item extends Model
|
class Item extends Model
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Listeners\Updates;
|
namespace Crater\Listeners\Updates;
|
||||||
|
|
||||||
class Listener
|
class Listener
|
||||||
{
|
{
|
||||||
@ -15,9 +15,9 @@ class Listener
|
|||||||
protected function check($event)
|
protected function check($event)
|
||||||
{
|
{
|
||||||
// Do not apply to the same or newer versions
|
// Do not apply to the same or newer versions
|
||||||
// if (version_compare($event->old, static::VERSION, '>=')) {
|
if (version_compare($event->old, static::VERSION, '>=')) {
|
||||||
// return false;
|
return false;
|
||||||
// }
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Listeners\Updates\V10;
|
namespace Crater\Listeners\Updates\V10;
|
||||||
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
use Laraspace\Listeners\Updates\Listener;
|
use Crater\Listeners\Updates\Listener;
|
||||||
use Laraspace\Events\UpdateFinished;
|
use Crater\Events\UpdateFinished;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
class Version101 extends Listener
|
class Version101 extends Listener
|
||||||
{
|
{
|
||||||
@ -21,12 +21,12 @@ class Version101 extends Listener
|
|||||||
*/
|
*/
|
||||||
public function handle(UpdateFinished $event)
|
public function handle(UpdateFinished $event)
|
||||||
{
|
{
|
||||||
// if (!$this->check($event)) {
|
if (!$this->check($event)) {
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
|
|
||||||
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
|
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
|
||||||
|
|
||||||
Setting::getSetting('version', self::VERSION);
|
Setting::setSetting('version', self::VERSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Mail;
|
namespace Crater\Mail;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Mail;
|
namespace Crater\Mail;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Mail;
|
namespace Crater\Mail;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Mail;
|
namespace Crater\Mail;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Notifications;
|
namespace Crater\Notifications;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Notifications\Notification;
|
use Illuminate\Notifications\Notification;
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Laraspace\User;
|
use Crater\User;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Providers;
|
namespace Crater\Providers;
|
||||||
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
use Illuminate\Pagination\Paginator;
|
use Illuminate\Pagination\Paginator;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Providers;
|
namespace Crater\Providers;
|
||||||
|
|
||||||
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
||||||
use Laravel\Passport\Passport;
|
use Laravel\Passport\Passport;
|
||||||
@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $policies = [
|
protected $policies = [
|
||||||
'Laraspace\Model' => 'Laraspace\Policies\ModelPolicy',
|
'Crater\Model' => 'Crater\Policies\ModelPolicy',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Providers;
|
namespace Crater\Providers;
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Broadcast;
|
use Illuminate\Support\Facades\Broadcast;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Providers;
|
namespace Crater\Providers;
|
||||||
|
|
||||||
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
||||||
use Illuminate\Auth\Events\Registered;
|
use Illuminate\Auth\Events\Registered;
|
||||||
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
|
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
|
||||||
use Laraspace\Events\UpdateFinished;
|
use Crater\Events\UpdateFinished;
|
||||||
use Laraspace\Listeners\Updates\V10\Version101;
|
use Crater\Listeners\Updates\V10\Version101;
|
||||||
|
|
||||||
class EventServiceProvider extends ServiceProvider
|
class EventServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Providers;
|
namespace Crater\Providers;
|
||||||
|
|
||||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@ -13,7 +13,7 @@ class RouteServiceProvider extends ServiceProvider
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $namespace = 'Laraspace\Http\Controllers';
|
protected $namespace = 'Crater\Http\Controllers';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Define your route model bindings, pattern filters, etc.
|
* Define your route model bindings, pattern filters, etc.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Proxy;
|
namespace Crater\Proxy;
|
||||||
|
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laraspace\Http\Requests\DatabaseEnvironmentRequest;
|
use Crater\Http\Requests\DatabaseEnvironmentRequest;
|
||||||
use Laraspace\Http\Requests\MailEnvironmentRequest;
|
use Crater\Http\Requests\MailEnvironmentRequest;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
class PermissionsChecker
|
class PermissionsChecker
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
class RequirementsChecker
|
class RequirementsChecker
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Exception\RequestException;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
trait SiteApi
|
trait SiteApi
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
class TimeZones
|
class TimeZones
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace\Space;
|
namespace Crater\Space;
|
||||||
|
|
||||||
use File;
|
use File;
|
||||||
use ZipArchive;
|
use ZipArchive;
|
||||||
use Artisan;
|
use Artisan;
|
||||||
use GuzzleHttp\Exception\RequestException;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Laraspace\Space\SiteApi;
|
use Crater\Space\SiteApi;
|
||||||
use Laraspace\Events\UpdateFinished;
|
use Crater\Events\UpdateFinished;
|
||||||
use Laraspace\Setting;
|
use Crater\Setting;
|
||||||
|
|
||||||
class Updater
|
class Updater
|
||||||
{
|
{
|
||||||
use SiteApi;
|
use SiteApi;
|
||||||
|
|
||||||
public static function update($installed, $version)
|
public static function update($installed, $version, $isMinor)
|
||||||
{
|
{
|
||||||
$data = null;
|
$data = null;
|
||||||
$path = null;
|
$path = null;
|
||||||
|
|
||||||
$url = '/download/'.$version;
|
$url = '/downloads/file/'.$version.'?type=update';
|
||||||
|
|
||||||
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
||||||
|
|
||||||
@ -40,8 +40,8 @@ class Updater
|
|||||||
// Create temp directory
|
// Create temp directory
|
||||||
$path = 'temp-' . md5(mt_rand());
|
$path = 'temp-' . md5(mt_rand());
|
||||||
$path2 = 'temp2-' . md5(mt_rand());
|
$path2 = 'temp2-' . md5(mt_rand());
|
||||||
$temp_path = storage_path('app/temp') . '/' . $path;
|
$temp_path = storage_path('app') . '/' . $path;
|
||||||
$temp_path2 = storage_path('app/temp') . '/' . $path2;
|
$temp_path2 = storage_path('app') . '/' . $path2;
|
||||||
|
|
||||||
if (!File::isDirectory($temp_path)) {
|
if (!File::isDirectory($temp_path)) {
|
||||||
File::makeDirectory($temp_path);
|
File::makeDirectory($temp_path);
|
||||||
@ -78,7 +78,9 @@ class Updater
|
|||||||
File::deleteDirectory($temp_path2);
|
File::deleteDirectory($temp_path2);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
if (!$isMinor) {
|
||||||
event(new UpdateFinished($installed, $version));
|
event(new UpdateFinished($installed, $version));
|
||||||
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'success' => true,
|
'success' => true,
|
||||||
@ -97,7 +99,7 @@ class Updater
|
|||||||
public static function checkForUpdate()
|
public static function checkForUpdate()
|
||||||
{
|
{
|
||||||
$data = null;
|
$data = null;
|
||||||
$url = '/check/latest/download/'.Setting::getSetting('version');
|
$url = '/downloads/check/latest/'.Setting::getSetting('version');
|
||||||
|
|
||||||
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
$response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
use Laraspace\CompanySetting;
|
use Crater\CompanySetting;
|
||||||
use Laraspace\Currency;
|
use Crater\Currency;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set Active Path
|
* Set Active Path
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\City;
|
use Crater\City;
|
||||||
use Laraspace\Country;
|
use Crater\Country;
|
||||||
use Laraspace\Address;
|
use Crater\Address;
|
||||||
|
|
||||||
class State extends Model
|
class State extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
14
app/Tax.php
14
app/Tax.php
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\TaxType;
|
use Crater\TaxType;
|
||||||
use Laraspace\Invoice;
|
use Crater\Invoice;
|
||||||
use Laraspace\Estimate;
|
use Crater\Estimate;
|
||||||
use Laraspace\Item;
|
use Crater\Item;
|
||||||
use Laraspace\InvoiceItem;
|
use Crater\InvoiceItem;
|
||||||
use Laraspace\EstimateItem;
|
use Crater\EstimateItem;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Laraspace\Tax;
|
use Crater\Tax;
|
||||||
|
|
||||||
class TaxType extends Model
|
class TaxType extends Model
|
||||||
{
|
{
|
||||||
|
|||||||
14
app/User.php
14
app/User.php
@ -1,16 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Laraspace;
|
namespace Crater;
|
||||||
|
|
||||||
use Illuminate\Notifications\Notifiable;
|
use Illuminate\Notifications\Notifiable;
|
||||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||||
use Laraspace\Conversation;
|
use Crater\Conversation;
|
||||||
use carbon\carbon;
|
use carbon\carbon;
|
||||||
use Laraspace\MemberLoan;
|
use Crater\MemberLoan;
|
||||||
use Laraspace\Address;
|
use Crater\Address;
|
||||||
use Laraspace\Payment;
|
use Crater\Payment;
|
||||||
use Laraspace\Company;
|
use Crater\Company;
|
||||||
use Laraspace\Notifications\MailResetPasswordNotification;
|
use Crater\Notifications\MailResetPasswordNotification;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
use Spatie\MediaLibrary\HasMedia\HasMedia;
|
||||||
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|||||||
@ -28,17 +28,17 @@ $app = new Illuminate\Foundation\Application(
|
|||||||
|
|
||||||
$app->singleton(
|
$app->singleton(
|
||||||
Illuminate\Contracts\Http\Kernel::class,
|
Illuminate\Contracts\Http\Kernel::class,
|
||||||
Laraspace\Http\Kernel::class
|
Crater\Http\Kernel::class
|
||||||
);
|
);
|
||||||
|
|
||||||
$app->singleton(
|
$app->singleton(
|
||||||
Illuminate\Contracts\Console\Kernel::class,
|
Illuminate\Contracts\Console\Kernel::class,
|
||||||
Laraspace\Console\Kernel::class
|
Crater\Console\Kernel::class
|
||||||
);
|
);
|
||||||
|
|
||||||
$app->singleton(
|
$app->singleton(
|
||||||
Illuminate\Contracts\Debug\ExceptionHandler::class,
|
Illuminate\Contracts\Debug\ExceptionHandler::class,
|
||||||
Laraspace\Exceptions\Handler::class
|
Crater\Exceptions\Handler::class
|
||||||
);
|
);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -38,7 +38,7 @@
|
|||||||
"database"
|
"database"
|
||||||
],
|
],
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Laraspace\\": "app/"
|
"Crater\\": "app/"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"app/Space/helpers.php"
|
"app/Space/helpers.php"
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user