Skip to content
This repository has been archived by the owner on Dec 21, 2021. It is now read-only.

Commit

Permalink
Merge in release/0.2.0
Browse files Browse the repository at this point in the history 
commit b124ab7
Author: Alec Ritson <[email protected]>
Date:   Mon Feb 4 14:02:37 2019 +0000

    Update dependancy

commit c251049
Author: Alec Ritson <[email protected]>
Date:   Fri Feb 1 12:22:04 2019 +0000

    Compile

commit 78a99fe
Author: Alec Ritson <[email protected]>
Date:   Fri Feb 1 12:18:12 2019 +0000

    Fix variant json dump

commit 2c5cd90
Author: Alec Ritson <[email protected]>
Date:   Fri Feb 1 12:18:00 2019 +0000

    Round off multiplication

commit 80702a6
Author: Alec Ritson <[email protected]>
Date:   Fri Feb 1 12:17:48 2019 +0000

    Add shipping preference

commit ee884c7
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 30 15:03:33 2019 +0000

    Allow for fractal still

commit 8e42627
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 28 12:51:54 2019 +0000

    category list updates

commit f334b49
Author: Alec Ritson <[email protected]>
Date:   Thu Jan 24 11:26:29 2019 +0000

    Add dispatch for positioning

commit 3b5b63f
Author: Alec Ritson <[email protected]>
Date:   Thu Jan 24 11:09:39 2019 +0000

    Compile production

commit db06c58
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 23 15:33:21 2019 +0000

    Extra logic to user include

commit cfba001
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 23 11:00:34 2019 +0000

    Fix user account check

commit 75d92f2
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 18 16:21:21 2019 +0000

    Compile

commit 0dfe8a9
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 18 16:16:13 2019 +0000

    Added new category tree

    commit 29c2e23
    Author: Alec Ritson <[email protected]>
    Date:   Fri Jan 18 16:15:25 2019 +0000

        Remove dependencies

    commit 10ead0e
    Author: Alec Ritson <[email protected]>
    Date:   Fri Jan 18 12:57:32 2019 +0000

        Squashed commit of the following:

        commit 6eaf408
        Author: Alec Ritson <[email protected]>
        Date:   Fri Jan 18 12:57:06 2019 +0000

            Add missing param

        commit a5117b8
        Author: Alec Ritson <[email protected]>
        Date:   Tue Jan 15 10:53:31 2019 +0000

            Streamline composer

    commit e571af7
    Author: Alec Ritson <[email protected]>
    Date:   Tue Jan 15 10:16:19 2019 +0000

        Added new list item component

    commit b9f717d
    Author: Alec Ritson <[email protected]>
    Date:   Fri Jan 11 17:31:28 2019 +0000

        Update category tree

commit 6eaf408
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 18 12:57:06 2019 +0000

    Add missing param

commit a5117b8
Author: Alec Ritson <[email protected]>
Date:   Tue Jan 15 10:53:31 2019 +0000

    Streamline composer

commit 0d87963
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 15:35:15 2019 +0000

    Seperate save methods

commit 781e3fb
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 15:34:57 2019 +0000

    Add save prop

commit 6968afc
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 15:34:00 2019 +0000

    Allow explicit override

commit cd07d39
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 14:03:51 2019 +0000

    Show shipping variant name

commit d9f38f5
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 12:28:58 2019 +0000

    Force redirect if logged in

    the redirecTo home thing is being a pain.

commit df17462
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 12:12:43 2019 +0000

    Compile production

commit e2bdee0
Author: Alec Ritson <[email protected]>
Date:   Fri Jan 11 12:09:31 2019 +0000

    Add extra details

commit 7aa8ec1
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 9 10:59:42 2019 +0000

    Compile

commit 57cf922
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 9 10:16:29 2019 +0000

    Get categories editable

commit 48500d1
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 9 10:02:47 2019 +0000

    Get category tree loading

commit 4664930
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 9 09:29:13 2019 +0000

    Add eager load

commit f857ba4
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 9 09:15:10 2019 +0000

    Get more product data showing

commit 22b2205
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 17:06:08 2019 +0000

    Compile production

commit 7b8aec7
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 17:01:13 2019 +0000

    Add way to clear date

commit 3d1e839
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 16:15:28 2019 +0000

    Build

commit 9f49b8a
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 16:09:41 2019 +0000

    Make sure we can remove image

commit 5d35ae5
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 14:10:25 2019 +0000

    Add code mirror

commit 13dc9d3
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 14:10:17 2019 +0000

    Compile

commit a3518b2
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 14:06:33 2019 +0000

    Move resources to setup

commit 0ec4ca9
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 14:06:24 2019 +0000

    Support text pasting

commit a31dea5
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 11:34:11 2019 +0000

    Update error message formatting

commit 507f179
Author: Alec Ritson <[email protected]>
Date:   Mon Jan 7 11:33:55 2019 +0000

    Added form elements

commit 76c9560
Author: Alec Ritson <[email protected]>
Date:   Thu Jan 3 11:41:20 2019 +0000

    Rig up to Dropzone

commit b326661
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 2 17:30:00 2019 +0000

    Add keyup event

commit 6b87906
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 2 11:38:09 2019 +0000

    Register media upload

commit bfd7623
Author: Alec Ritson <[email protected]>
Date:   Wed Jan 2 11:37:58 2019 +0000

    Add media upload

commit 82700ad
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 21 11:25:07 2018 +0000

    Remove debug

commit 4e349a9
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 21 11:24:55 2018 +0000

    Plugin improvements

commit dc27c25
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 21 11:23:53 2018 +0000

    Added discounts

commit ccd3f25
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 21 11:23:45 2018 +0000

    Support eloquent models

commit a8f838f
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 21 11:23:29 2018 +0000

    remove debug

commit ee28505
Author: Alec Ritson <[email protected]>
Date:   Fri Dec 14 12:08:08 2018 +0000

    Generate attribute groups from families

commit 5a08bc8
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 15:18:11 2018 +0000

    Remove unused tabs

    commit b2ca6890b5af3a0d373b7066ec86cc02e0fb6210
    Author: Alec Ritson <[email protected]>
    Date:   Wed Dec 12 15:15:48 2018 +0000

        remove unused tabs

    commit 8a666a5
    Author: Alec Ritson <[email protected]>
    Date:   Wed Dec 12 11:41:43 2018 +0000

        Show number attribute (#9)

        * Show number attribute

        * Apply fixes from StyleCI (#10)

    commit b02fb83
    Author: Alec Ritson <[email protected]>
    Date:   Tue Dec 11 17:03:19 2018 +0000

        Hotfix/fix tax wiping on stock update (#8)

        * Point to new inventory route

        * Build production

commit 6bdc9f6
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 15:05:14 2018 +0000

    Build dev

commit 9c0545c
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 15:04:28 2018 +0000

    Update path to svg

commit 4d74ec6
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 15:04:21 2018 +0000

    Catch missing attributes on edit

commit 34bf44f
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 15:04:09 2018 +0000

    Add missing method

commit 73379b8
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 14:47:38 2018 +0000

    Stop duplicate attribute group tabs

commit bf32696
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 12:18:24 2018 +0000

    Added attribute number field

    commit 8a666a5
    Author: Alec Ritson <[email protected]>
    Date:   Wed Dec 12 11:41:43 2018 +0000

        Show number attribute (#9)

        * Show number attribute

        * Apply fixes from StyleCI (#10)

    commit b02fb83
    Author: Alec Ritson <[email protected]>
    Date:   Tue Dec 11 17:03:19 2018 +0000

        Hotfix/fix tax wiping on stock update (#8)

        * Point to new inventory route

        * Build production

commit 14f65f4
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 11:08:46 2018 +0000

    Product table improvements

commit cca372d
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 10:06:51 2018 +0000

    Add loop key

commit e29a745
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 10:04:54 2018 +0000

    Update for eloquent resource

commit d98a484
Author: Alec Ritson <[email protected]>
Date:   Wed Dec 12 09:53:10 2018 +0000

    Remove attribute check

commit 63cc01b
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 17:24:12 2018 +0000

    Fix order view page

commit 60a0bd1
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 16:50:33 2018 +0000

    Send through proper data

commit cfc43df
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 16:22:52 2018 +0000

    Add setup js

commit 873799a
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 16:22:44 2018 +0000

    Support plugins better

commit 921ace1
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 11:31:53 2018 +0000

    don’t show if data isn’t present

commit b1e64c8
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 11:07:24 2018 +0000

    Fixing for api resources

commit 1f459e2
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 09:38:51 2018 +0000

    Get products listing again

commit d2782cf
Author: Alec Ritson <[email protected]>
Date:   Tue Dec 11 09:22:34 2018 +0000

    Support plugin resources
  • Loading branch information
@alecritson
alecritson committed Feb 5, 2019
1 parent 8a666a5 commit 759588d
Show file tree
Hide file tree
Showing 59 changed files with 1,240 additions and 535 deletions.
18 changes: 1 addition & 17 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,10 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.1.3",
"alaouy/youtube": "^2.1",
"barryvdh/laravel-cors": "^0.11.0",
"barryvdh/laravel-dompdf": "^0.8.2",
"braintree/braintree_php": "^3.28",
"hashids/hashids": "^2.0",
"intervention/image": "^2.4",
"kalnoy/nestedset": "^4.3",
"laravel/framework": "^5.6",
"laravel/passport": "^7.0",
"laravel/tinker": "^1.0",
"league/fractal": "^0.17.0",
"ruflin/elastica": "^6.0",
"spatie/laravel-permission": "^2.9",
"tightenco/ziggy": "^0.6.3",
"vinkla/hashids": "^4.0"
"getcandy/candy-api": "0.2.*"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"laravel/homestead": "^7.1",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~7.0",
"filp/whoops": "~2.0"
Expand Down
4 changes: 3 additions & 1 deletion mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"/resources/build/js/hub.js": "/resources/build/js/hub.js",
"/resources/build/css/hub.css": "/resources/build/css/hub.css"
"/resources/build/css/hub.css": "/resources/build/css/hub.css",
"/resources/build/js/setup.js": "/resources/build/js/setup.js",
"/resources/build/js/candyhub.js": "/resources/build/js/candyhub.js"
}
327 changes: 173 additions & 154 deletions package-lock.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"sortablejs": "^1.7.0",
"v-tooltip": "^2.0.0-rc.31",
"v2-datepicker": "^3.1.0",
"vue-codemirror": "^4.0.6",
"vue-drag-and-drop-list": "^1.0.0",
"vue-flatpickr-component": "^2.4.1",
"vue-lazyload": "^1.2.1",
Expand Down
1 change: 0 additions & 1 deletion resources/assets/js/bootstrap.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

window._ = require('lodash');

/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
Expand Down
23 changes: 23 additions & 0 deletions resources/assets/js/candyhub.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
class CandyHub {
constructor() {
this.plugins = [];
}
addPlugin(config) {
this.plugins.push(config);
}

getComponents(section) {
let components = [];
this.plugins.forEach(plugin => {
if (plugin.components && plugin.components.length) {
plugin.components.forEach(component => {
if (component.section == section) {
components.push(component);
}
});
}
});
return components;
}
}
export default new CandyHub();
6 changes: 3 additions & 3 deletions resources/assets/js/classes/ApiRequest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ class ApiRequest {

getError(field) {
if (this.errors['error'] && !field) {
return this.errors.error.message;
} else if (this.errors[field]) {
return this.errors[field][0];
return this.errors.message;
} else if (this.errors.errors && this.errors.errors[field]) {
return this.errors.errors[field][0];
}
}

Expand Down
1 change: 0 additions & 1 deletion resources/assets/js/classes/Hub/Base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export default class Base {
constructor() {
this.params = {};
this.version = 'v1';
console.log(axios);
}

page(page) {
Expand Down
5 changes: 4 additions & 1 deletion resources/assets/js/components.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ var includes = [
'select' : 'Select',
'taggable' : 'Taggable',
'textarea' : 'Textarea',
'toggle' : 'Toggle'
'toggle' : 'Toggle',
'media-upload' : 'MediaUpload',
'date-range-picker' : 'DateRangePicker',
'code-mirror' : 'CodeMirror',
}
},
/**
Expand Down
21 changes: 17 additions & 4 deletions resources/assets/js/components/catalogue-manager/categories/Edit.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,19 @@
* @return
*/
decorate(data) {
this.attribute_groups = data.attribute_groups.data;
let groups = [];
_.each(data.attributes.data, attribute => {
let exists = _.find(groups, group => {
return group.handle == attribute.group.data.handle;
});
if (attribute.group && !exists) {
groups.push(attribute.group.data);
}
});
this.attribute_groups = groups;
this.category = data;
this.category.attributes = this.category.attribute_data;
this.routes = this.category.routes.data;
Expand All @@ -61,7 +73,8 @@
*/
loadCategory(id) {
apiRequest.send('get', '/categories/' + this.categoryId, {}, {
includes: 'channels,layout,assets,assets.tags,children,parent,attribute_groups,attribute_groups.attributes,customer_groups,routes,products,children.products'
full_response: true,
includes: 'channels,layout,assets,assets.tags,children,parent,attributes.group.attributes,customerGroups,routes,products,children.products'
}).then(response => {
this.decorate(response.data);
document.title = this.$options.filters.attribute(this.category, 'name') + ' Category - GetCandy';
Expand Down Expand Up @@ -106,9 +119,9 @@
<candy-category-availability :category="category" v-if="category"></candy-category-availability>
</candy-tab>

<candy-tab name="Associations">
<candy-tab name="Associations" dispatch="product-positioning">
<candy-tabs nested="true">
<candy-tab name="Products" :selected="true">
<candy-tab name="Products" :selected="true" dispatch="product-positioning">
<candy-category-product-positioning :category-id="category.id" :sort="category.sort" :products="category.products.data"></candy-category-product-positioning>
</candy-tab>
<candy-tab name="Children Categories">
Expand Down
Loading

0 comments on commit 759588d

Please sign in to comment.